From 51f06c7d0d90d38a73880f0761e50dc244f2a6ab Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Mon, 29 Jun 2020 10:12:06 +0200
Subject: [PATCH] Fix #33 Maven mojo change ignored

---
 .../org/apache/maven/cli/DaemonMavenCli.java  | 1899 +++++++++--------
 1 file changed, 961 insertions(+), 938 deletions(-)

diff --git a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index 9939d27d3..96142a30b 100644
--- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
@@ -23,7 +23,11 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -82,9 +86,10 @@
 import org.codehaus.plexus.DefaultContainerConfiguration;
 import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.PlexusContainerException;
 import org.codehaus.plexus.classworlds.ClassWorld;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.logging.LoggerManager;
 import org.codehaus.plexus.util.StringUtils;
@@ -122,57 +127,37 @@ public class DaemonMavenCli
 
     public static final String STYLE_COLOR_PROPERTY = "style.color";
 
-    private final LoggerManager plexusLoggerManager;
-
     private final ILoggerFactory slf4jLoggerFactory;
 
     private final Logger slf4jLogger;
 
     private final ClassWorld classWorld;
 
-    private DefaultPlexusContainer container;
-
-    private EventSpyDispatcher eventSpyDispatcher;
-
-    private ModelProcessor modelProcessor;
-
-    private Maven maven;
-
-    private MavenExecutionRequestPopulator executionRequestPopulator;
-
-    private ToolchainsBuilder toolchainsBuilder;
-
-    private DefaultSecDispatcher dispatcher;
-
-    private Map<String, ConfigurationProcessor> configurationProcessors;
-
     public DaemonMavenCli() throws Exception {
         slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
         slf4jLogger = slf4jLoggerFactory.getLogger( this.getClass().getName() );
-        plexusLoggerManager = new Slf4jLoggerManager();
 
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         classWorld = new ClassWorld("plexus.core", cl);
 
-        container();
     }
 
     // TODO need to externalize CliRequest
     public int doMain(CliRequest cliRequest) throws Exception
     {
         Properties props = (Properties) System.getProperties().clone();
-        try {
-            initialize(cliRequest);
-            cli(cliRequest);
-            properties(cliRequest);
-            logging(cliRequest);
-            configure(cliRequest);
-            version( cliRequest );
-            toolchains(cliRequest);
-            populateRequest( cliRequest );
-            encryption( cliRequest );
-            repository( cliRequest );
-            return execute( cliRequest);
+        try (DaemonExecution de = new DaemonExecution(classWorld, slf4jLoggerFactory, slf4jLogger, cliRequest.getMultiModuleProjectDirectory().toPath())) {
+            de.initialize(cliRequest);
+            de.cli(cliRequest);
+            de.properties(cliRequest);
+            de.logging(cliRequest);
+            de.configure(cliRequest);
+            de.version( cliRequest );
+            de.toolchains(cliRequest);
+            de.populateRequest( cliRequest );
+            de.encryption( cliRequest );
+            de.repository( cliRequest );
+            return de.execute( cliRequest);
         }
         catch ( ExitException e )
         {
@@ -181,1156 +166,1194 @@ public int doMain(CliRequest cliRequest) throws Exception
         finally
         {
             System.setProperties(props);
-            eventSpyDispatcher.close();
         }
     }
 
-    void initialize( CliRequest cliRequest )
-        throws ExitException
+    
+
+    // ----------------------------------------------------------------------
+    // System properties handling
+    // ----------------------------------------------------------------------
+
+    static class ExitException
+        extends Exception
     {
-        cliRequest.classWorld = classWorld;
+        static final long serialVersionUID = 1L;
+        int exitCode;
 
-        if ( cliRequest.workingDirectory == null )
+        ExitException( int exitCode )
         {
-            cliRequest.workingDirectory = System.getProperty( "user.dir" );
+            this.exitCode = exitCode;
         }
+    }
 
-        if ( cliRequest.multiModuleProjectDirectory == null )
-        {
-            System.err.format(
-                "-D%s system property is not set.", MULTIMODULE_PROJECT_DIRECTORY );
-            throw new ExitException( 1 );
-        }
-        System.setProperty( "maven.multiModuleProjectDirectory", cliRequest.multiModuleProjectDirectory.toString() );
+    /**
+     * Contains objects disposable per mvnd execution and their dependents.
+     */
+    static class DaemonExecution implements AutoCloseable {
+        private static final Pattern LAST_ANSI_SEQUENCE = Pattern.compile( "(\u001B\\[[;\\d]*[ -/]*[@-~])[^\u001B]*$" );
+        private static final String ANSI_RESET = "\u001B\u005Bm";
+        private final ClassWorld classWorld;
+        private final DefaultPlexusContainer container;
+        private final EventSpyDispatcher eventSpyDispatcher;
+        private final Maven maven;
+        private final LoggerManager plexusLoggerManager;
+        private final MavenExecutionRequestPopulator executionRequestPopulator;
+        private final ToolchainsBuilder toolchainsBuilder;
+        private final DefaultSecDispatcher dispatcher;
+        private final ModelProcessor modelProcessor;
+        private final Map<String, ConfigurationProcessor> configurationProcessors;
+        private final Logger slf4jLogger;
+        private final Path baseDir;
+        public DaemonExecution(ClassWorld classWorld, ILoggerFactory slf4jLoggerFactory, Logger slf4jLogger, Path baseDir) throws PlexusContainerException, ComponentLookupException {
+            this.classWorld = classWorld;
+            this.plexusLoggerManager = new Slf4jLoggerManager();
+            this.baseDir = baseDir;
+            this.slf4jLogger = slf4jLogger;
+            ClassRealm coreRealm = classWorld.getClassRealm( "plexus.core" );
+            if ( coreRealm == null )
+            {
+                coreRealm = classWorld.getRealms().iterator().next();
+            }
 
-        //
-        // Make sure the Maven home directory is an absolute path to save us from confusion with say drive-relative
-        // Windows paths.
-        //
-        String mavenHome = System.getProperty( "maven.home" );
+//            List<File> extClassPath = parseExtClasspath( cliRequest );
 
-        if ( mavenHome != null )
-        {
-            System.setProperty( "maven.home", new File( mavenHome ).getAbsolutePath() );
-        }
-    }
+            CoreExtensionEntry coreEntry = CoreExtensionEntry.discoverFrom( coreRealm );
+            List<CoreExtensionEntry> extensions = Collections.emptyList();
+//                loadCoreExtensions( cliRequest, coreRealm, coreEntry.getExportedArtifacts() );
 
-    void cli( CliRequest cliRequest )
-        throws Exception
-    {
-        CLIManager cliManager = new CLIManager();
+            ClassRealm containerRealm = coreRealm;
 
-        List<String> args = new ArrayList<>();
-        CommandLine mavenConfig = null;
-        try
-        {
-            File configFile = new File( cliRequest.multiModuleProjectDirectory, MVN_MAVEN_CONFIG );
+            ContainerConfiguration cc = new DefaultContainerConfiguration().setClassWorld( classWorld )
+                .setRealm( containerRealm ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring( true )
+                .setJSR250Lifecycle( true ).setName( "maven" );
+
+            Set<String> exportedArtifacts = new HashSet<>( coreEntry.getExportedArtifacts() );
+            Set<String> exportedPackages = new HashSet<>( coreEntry.getExportedPackages() );
+//            for ( CoreExtensionEntry extension : extensions )
+//            {
+//                exportedArtifacts.addAll( extension.getExportedArtifacts() );
+//                exportedPackages.addAll( extension.getExportedPackages() );
+//            }
 
-            if ( configFile.isFile() )
+            final CoreExports exports = new CoreExports( containerRealm, exportedArtifacts, exportedPackages );
+
+            container = new DefaultPlexusContainer( cc, new AbstractModule()
             {
-                for ( String arg : new String( Files.readAllBytes( configFile.toPath() ) ).split( "\\s+" ) )
+                @Override
+                protected void configure()
                 {
-                    if ( !arg.isEmpty() )
-                    {
-                        args.add( arg );
-                    }
+                    bind( ILoggerFactory.class ).toInstance( slf4jLoggerFactory );
+                    bind( CoreExports.class ).toInstance( exports );
                 }
+            } );
 
-                mavenConfig = cliManager.parse( args.toArray( new String[0] ) );
-                List<?> unrecongized = mavenConfig.getArgList();
-                if ( !unrecongized.isEmpty() )
-                {
-                    throw new ParseException( "Unrecognized maven.config entries: " + unrecongized );
-                }
-            }
-        }
-        catch ( ParseException e )
-        {
-            System.err.println( "Unable to parse maven.config: " + e.getMessage() );
-            cliManager.displayHelp( System.out );
-            throw e;
-        }
+            // NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
+            container.setLookupRealm( null );
+            Thread.currentThread().setContextClassLoader( container.getContainerRealm() );
 
-        try
-        {
-            if ( mavenConfig == null )
-            {
-                cliRequest.commandLine = cliManager.parse( cliRequest.args );
-            }
-            else
+            container.setLoggerManager( plexusLoggerManager );
+
+            for ( CoreExtensionEntry extension : extensions )
             {
-                cliRequest.commandLine = cliMerge( cliManager.parse( cliRequest.args ), mavenConfig );
+                container.discoverComponents( extension.getClassRealm(), new SessionScopeModule( container ),
+                                              new MojoExecutionScopeModule( container ) );
             }
-        }
-        catch ( ParseException e )
-        {
-            System.err.println( "Unable to parse command line options: " + e.getMessage() );
-            cliManager.displayHelp( System.out );
-            throw e;
-        }
 
-        if ( cliRequest.commandLine.hasOption( CLIManager.HELP ) )
-        {
-            cliManager.displayHelp( System.out );
-            throw new ExitException( 0 );
-        }
+//            container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() );
 
-    }
+            eventSpyDispatcher = container.lookup( EventSpyDispatcher.class );
 
-    private CommandLine cliMerge( CommandLine mavenArgs, CommandLine mavenConfig )
-    {
-        CommandLine.Builder commandLineBuilder = new CommandLine.Builder();
+            maven = container.lookup( Maven.class );
 
-        // the args are easy, cli first then config file
-        for ( String arg : mavenArgs.getArgs() )
-        {
-            commandLineBuilder.addArg( arg );
-        }
-        for ( String arg : mavenConfig.getArgs() )
-        {
-            commandLineBuilder.addArg( arg );
-        }
+            executionRequestPopulator = container.lookup( MavenExecutionRequestPopulator.class );
 
-        // now add all options, except for -D with cli first then config file
-        List<Option> setPropertyOptions = new ArrayList<>();
-        for ( Option opt : mavenArgs.getOptions() )
-        {
-            if ( String.valueOf( CLIManager.SET_SYSTEM_PROPERTY ).equals( opt.getOpt() ) )
-            {
-                setPropertyOptions.add( opt );
-            }
-            else
-            {
-                commandLineBuilder.addOption( opt );
-            }
-        }
-        for ( Option opt : mavenConfig.getOptions() )
-        {
-            commandLineBuilder.addOption( opt );
-        }
-        // finally add the CLI system properties
-        for ( Option opt : setPropertyOptions )
-        {
-            commandLineBuilder.addOption( opt );
-        }
-        return commandLineBuilder.build();
-    }
+            modelProcessor = container.lookup( ModelProcessor.class );
 
-    /**
-     * configure logging
-     */
-    void logging( CliRequest cliRequest )
-    {
-        // LOG LEVEL
-        cliRequest.debug = cliRequest.commandLine.hasOption( CLIManager.DEBUG );
-        cliRequest.quiet = !cliRequest.debug && cliRequest.commandLine.hasOption( CLIManager.QUIET );
-        cliRequest.showErrors = cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.ERRORS );
+            configurationProcessors = container.lookupMap( ConfigurationProcessor.class );
 
-        java.util.logging.Level level;
-        if ( cliRequest.debug )
-        {
-            cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_DEBUG );
-            level = Level.FINER;
-        }
-        else if ( cliRequest.quiet )
-        {
-            cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_ERROR );
-            level = Level.SEVERE;
-        }
-        else
-        {
-            cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_INFO );
-            level = Level.INFO;
-        }
+            toolchainsBuilder = container.lookup( ToolchainsBuilder.class );
 
-        // LOG COLOR
-        String styleColor = cliRequest.getUserProperties().getProperty( STYLE_COLOR_PROPERTY, "auto" );
-        if ( "always".equals( styleColor ) )
-        {
-            MessageUtils.setColorEnabled( true );
-        }
-        else if ( "never".equals( styleColor ) )
-        {
-            MessageUtils.setColorEnabled( false );
-        }
-        else if ( !"auto".equals( styleColor ) )
-        {
-            throw new IllegalArgumentException( "Invalid color configuration option [" + styleColor
-                + "]. Supported values are (auto|always|never)." );
+            dispatcher = (DefaultSecDispatcher) container.lookup( SecDispatcher.class, "maven" );
         }
-        else if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE )
-            || cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
-        {
-            MessageUtils.setColorEnabled( false );
+
+        @Override
+        public void close() {
+            eventSpyDispatcher.close();
+            container.dispose();
+            purgeRealms();
+        }
+
+        void purgeRealms() {
+            for (ClassRealm r : classWorld.getRealms()) {
+                for (URL url : r.getURLs()) {
+                    try {
+                        final String urlPath = url.getPath();
+                        if (urlPath != null && urlPath.contains("-SNAPSHOT") // do not keep SNAPSHOTs
+                                || Paths.get(url.toURI()).startsWith(baseDir) // do not keep jars from the source tree
+                        ) {
+                            classWorld.disposeRealm(r.getId());
+                            break;
+                        }
+                    } catch (NoSuchRealmException e) {
+                        throw new RuntimeException("Could not remove " + r.getId(), e);
+                    } catch (URISyntaxException e) {
+                        throw new RuntimeException("Could not transform URL " + url + " to URI", e);
+                    }
+                }
+            }
         }
 
-        // LOG STREAMS
-        if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
+        void initialize( CliRequest cliRequest )
+            throws ExitException
         {
-            File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) );
-            logFile = resolveFile( logFile, cliRequest.workingDirectory );
+            cliRequest.classWorld = classWorld;
 
-            // redirect stdout and stderr to file
-            try
+            if ( cliRequest.workingDirectory == null )
             {
-                PrintStream ps = new PrintStream( new FileOutputStream( logFile ) );
-                System.setOut( ps );
-                System.setErr( ps );
+                cliRequest.workingDirectory = System.getProperty( "user.dir" );
             }
-            catch ( FileNotFoundException e )
-            {
-                //
-                // Ignore
-                //
-            }
-        }
-
-    }
 
-    private void version( CliRequest cliRequest ) throws ExitException
-    {
-        if ( cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.VERSION ) )
-        {
-            AbstractLoggingSpy.instance().append(null, CLIReportingUtils.showVersion());
-            if (cliRequest.commandLine.hasOption( CLIManager.VERSION )) {
-                throw new ExitException( 0 );
+            if ( cliRequest.multiModuleProjectDirectory == null )
+            {
+                System.err.format(
+                    "-D%s system property is not set.", MULTIMODULE_PROJECT_DIRECTORY );
+                throw new ExitException( 1 );
             }
-        }
-    }
-
-    private void commands( CliRequest cliRequest )
-    {
-        if ( cliRequest.showErrors )
-        {
-            slf4jLogger.info( "Error stacktraces are turned on." );
-        }
+            System.setProperty( "maven.multiModuleProjectDirectory", cliRequest.multiModuleProjectDirectory.toString() );
 
-        if ( MavenExecutionRequest.CHECKSUM_POLICY_WARN.equals( cliRequest.request.getGlobalChecksumPolicy() ) )
-        {
-            slf4jLogger.info( "Disabling strict checksum verification on all artifact downloads." );
-        }
-        else if ( MavenExecutionRequest.CHECKSUM_POLICY_FAIL.equals( cliRequest.request.getGlobalChecksumPolicy() ) )
-        {
-            slf4jLogger.info( "Enabling strict checksum verification on all artifact downloads." );
-        }
+            //
+            // Make sure the Maven home directory is an absolute path to save us from confusion with say drive-relative
+            // Windows paths.
+            //
+            String mavenHome = System.getProperty( "maven.home" );
 
-        if ( slf4jLogger.isDebugEnabled() )
-        {
-            slf4jLogger.debug( "Message scheme: {}", ( MessageUtils.isColorEnabled() ? "color" : "plain" ) );
-            if ( MessageUtils.isColorEnabled() )
-            {
-                MessageBuilder buff = MessageUtils.buffer();
-                buff.a( "Message styles: " );
-                buff.a( MessageUtils.level().debug( "debug" ) ).a( ' ' );
-                buff.a( MessageUtils.level().info( "info" ) ).a( ' ' );
-                buff.a( MessageUtils.level().warning( "warning" ) ).a( ' ' );
-                buff.a( MessageUtils.level().error( "error" ) ).a( ' ' );
-
-                buff.success( "success" ).a( ' ' );
-                buff.failure( "failure" ).a( ' ' );
-                buff.strong( "strong" ).a( ' ' );
-                buff.mojo( "mojo" ).a( ' ' );
-                buff.project( "project" );
-                slf4jLogger.debug( buff.toString() );
+            if ( mavenHome != null )
+            {
+                System.setProperty( "maven.home", new File( mavenHome ).getAbsolutePath() );
             }
         }
-    }
-
-    //Needed to make this method package visible to make writing a unit test possible
-    //Maybe it's better to move some of those methods to separate class (SoC).
-    void properties( CliRequest cliRequest )
-    {
-        populateProperties( cliRequest.commandLine, cliRequest.systemProperties, cliRequest.userProperties );
-    }
 
-    void container()
-        throws Exception
-    {
-        ClassRealm coreRealm = classWorld.getClassRealm( "plexus.core" );
-        if ( coreRealm == null )
+        void cli( CliRequest cliRequest )
+            throws Exception
         {
-            coreRealm = classWorld.getRealms().iterator().next();
-        }
-
-//        List<File> extClassPath = parseExtClasspath( cliRequest );
+            CLIManager cliManager = new CLIManager();
 
-        CoreExtensionEntry coreEntry = CoreExtensionEntry.discoverFrom( coreRealm );
-        List<CoreExtensionEntry> extensions = Collections.emptyList();
-//            loadCoreExtensions( cliRequest, coreRealm, coreEntry.getExportedArtifacts() );
-
-        ClassRealm containerRealm = coreRealm;
-
-        ContainerConfiguration cc = new DefaultContainerConfiguration().setClassWorld( classWorld )
-            .setRealm( containerRealm ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring( true )
-            .setJSR250Lifecycle( true ).setName( "maven" );
-
-        Set<String> exportedArtifacts = new HashSet<>( coreEntry.getExportedArtifacts() );
-        Set<String> exportedPackages = new HashSet<>( coreEntry.getExportedPackages() );
-//        for ( CoreExtensionEntry extension : extensions )
-//        {
-//            exportedArtifacts.addAll( extension.getExportedArtifacts() );
-//            exportedPackages.addAll( extension.getExportedPackages() );
-//        }
+            List<String> args = new ArrayList<>();
+            CommandLine mavenConfig = null;
+            try
+            {
+                File configFile = new File( cliRequest.multiModuleProjectDirectory, MVN_MAVEN_CONFIG );
 
-        final CoreExports exports = new CoreExports( containerRealm, exportedArtifacts, exportedPackages );
+                if ( configFile.isFile() )
+                {
+                    for ( String arg : new String( Files.readAllBytes( configFile.toPath() ) ).split( "\\s+" ) )
+                    {
+                        if ( !arg.isEmpty() )
+                        {
+                            args.add( arg );
+                        }
+                    }
 
-        container = new DefaultPlexusContainer( cc, new AbstractModule()
-        {
-            @Override
-            protected void configure()
+                    mavenConfig = cliManager.parse( args.toArray( new String[0] ) );
+                    List<?> unrecongized = mavenConfig.getArgList();
+                    if ( !unrecongized.isEmpty() )
+                    {
+                        throw new ParseException( "Unrecognized maven.config entries: " + unrecongized );
+                    }
+                }
+            }
+            catch ( ParseException e )
             {
-                bind( ILoggerFactory.class ).toInstance( slf4jLoggerFactory );
-                bind( CoreExports.class ).toInstance( exports );
+                System.err.println( "Unable to parse maven.config: " + e.getMessage() );
+                cliManager.displayHelp( System.out );
+                throw e;
             }
-        } );
-
-        // NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
-        container.setLookupRealm( null );
-        Thread.currentThread().setContextClassLoader( container.getContainerRealm() );
 
-        container.setLoggerManager( plexusLoggerManager );
-
-        for ( CoreExtensionEntry extension : extensions )
-        {
-            container.discoverComponents( extension.getClassRealm(), new SessionScopeModule( container ),
-                                          new MojoExecutionScopeModule( container ) );
-        }
-
-//        container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() );
-
-        eventSpyDispatcher = container.lookup( EventSpyDispatcher.class );
-
-        maven = container.lookup( Maven.class );
-
-        executionRequestPopulator = container.lookup( MavenExecutionRequestPopulator.class );
-
-        modelProcessor = createModelProcessor( container );
-
-        configurationProcessors = container.lookupMap( ConfigurationProcessor.class );
-
-        toolchainsBuilder = container.lookup( ToolchainsBuilder.class );
-
-        dispatcher = (DefaultSecDispatcher) container.lookup( SecDispatcher.class, "maven" );
-
-    }
+            try
+            {
+                if ( mavenConfig == null )
+                {
+                    cliRequest.commandLine = cliManager.parse( cliRequest.args );
+                }
+                else
+                {
+                    cliRequest.commandLine = cliMerge( cliManager.parse( cliRequest.args ), mavenConfig );
+                }
+            }
+            catch ( ParseException e )
+            {
+                System.err.println( "Unable to parse command line options: " + e.getMessage() );
+                cliManager.displayHelp( System.out );
+                throw e;
+            }
 
-    //
-    // This should probably be a separate tool and not be baked into Maven.
-    //
-    private void encryption( CliRequest cliRequest )
-        throws Exception
-    {
-        if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_MASTER_PASSWORD ) )
-        {
-            throw new UnsupportedOperationException( "Unsupported option: " + CLIManager.ENCRYPT_MASTER_PASSWORD );
-        }
-        else if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_PASSWORD ) )
-        {
-            throw new UnsupportedOperationException( "Unsupported option: " + CLIManager.ENCRYPT_PASSWORD );
-        }
-    }
+            if ( cliRequest.commandLine.hasOption( CLIManager.HELP ) )
+            {
+                cliManager.displayHelp( System.out );
+                throw new ExitException( 0 );
+            }
 
-    private void repository( CliRequest cliRequest )
-        throws Exception
-    {
-        if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY ) || Boolean.getBoolean(
-            "maven.legacyLocalRepo" ) )
-        {
-            cliRequest.request.setUseLegacyLocalRepository( true );
         }
-    }
-
-    private int execute(CliRequest cliRequest)
-        throws MavenExecutionRequestPopulationException
-    {
-        commands(cliRequest);
-
-        MavenExecutionRequest request = executionRequestPopulator.populateDefaults( cliRequest.request );
-
-        eventSpyDispatcher.onEvent( request );
-
-        MavenExecutionResult result = maven.execute( request );
-
-        eventSpyDispatcher.onEvent( result );
 
-        if ( result.hasExceptions() )
+        private CommandLine cliMerge( CommandLine mavenArgs, CommandLine mavenConfig )
         {
-            ExceptionHandler handler = new DefaultExceptionHandler();
+            CommandLine.Builder commandLineBuilder = new CommandLine.Builder();
 
-            Map<String, String> references = new LinkedHashMap<>();
-
-            MavenProject project = null;
-
-            for ( Throwable exception : result.getExceptions() )
+            // the args are easy, cli first then config file
+            for ( String arg : mavenArgs.getArgs() )
             {
-                ExceptionSummary summary = handler.handleException( exception );
-
-                logSummary( summary, references, "", cliRequest.showErrors );
+                commandLineBuilder.addArg( arg );
+            }
+            for ( String arg : mavenConfig.getArgs() )
+            {
+                commandLineBuilder.addArg( arg );
+            }
 
-                if ( project == null && exception instanceof LifecycleExecutionException )
+            // now add all options, except for -D with cli first then config file
+            List<Option> setPropertyOptions = new ArrayList<>();
+            for ( Option opt : mavenArgs.getOptions() )
+            {
+                if ( String.valueOf( CLIManager.SET_SYSTEM_PROPERTY ).equals( opt.getOpt() ) )
+                {
+                    setPropertyOptions.add( opt );
+                }
+                else
                 {
-                    project = ( (LifecycleExecutionException) exception ).getProject();
+                    commandLineBuilder.addOption( opt );
                 }
             }
+            for ( Option opt : mavenConfig.getOptions() )
+            {
+                commandLineBuilder.addOption( opt );
+            }
+            // finally add the CLI system properties
+            for ( Option opt : setPropertyOptions )
+            {
+                commandLineBuilder.addOption( opt );
+            }
+            return commandLineBuilder.build();
+        }
 
-            slf4jLogger.error( "" );
+        /**
+         * configure logging
+         */
+        void logging( CliRequest cliRequest )
+        {
+            // LOG LEVEL
+            cliRequest.debug = cliRequest.commandLine.hasOption( CLIManager.DEBUG );
+            cliRequest.quiet = !cliRequest.debug && cliRequest.commandLine.hasOption( CLIManager.QUIET );
+            cliRequest.showErrors = cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.ERRORS );
 
-            if ( !cliRequest.showErrors )
+            java.util.logging.Level level;
+            if ( cliRequest.debug )
             {
-                slf4jLogger.error( "To see the full stack trace of the errors, re-run Maven with the {} switch.",
-                        buffer().strong( "-e" ) );
+                cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_DEBUG );
+                level = Level.FINER;
             }
-            if ( !slf4jLogger.isDebugEnabled() )
+            else if ( cliRequest.quiet )
             {
-                slf4jLogger.error( "Re-run Maven using the {} switch to enable full debug logging.",
-                        buffer().strong( "-X" ) );
+                cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_ERROR );
+                level = Level.SEVERE;
             }
-
-            if ( !references.isEmpty() )
+            else
             {
-                slf4jLogger.error( "" );
-                slf4jLogger.error( "For more information about the errors and possible solutions"
-                                       + ", please read the following articles:" );
-
-                for ( Entry<String, String> entry : references.entrySet() )
-                {
-                    slf4jLogger.error( "{} {}", buffer().strong( entry.getValue() ), entry.getKey() );
-                }
+                cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_INFO );
+                level = Level.INFO;
             }
 
-            if ( project != null && !project.equals( result.getTopologicallySortedProjects().get( 0 ) ) )
+            // LOG COLOR
+            String styleColor = cliRequest.getUserProperties().getProperty( STYLE_COLOR_PROPERTY, "auto" );
+            if ( "always".equals( styleColor ) )
             {
-                slf4jLogger.error( "" );
-                slf4jLogger.error( "After correcting the problems, you can resume the build with the command" );
-                slf4jLogger.error( buffer().a( "  " ).strong( "mvn <args> -rf "
-                    + getResumeFrom( result.getTopologicallySortedProjects(), project ) ).toString() );
+                MessageUtils.setColorEnabled( true );
             }
-
-            if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( cliRequest.request.getReactorFailureBehavior() ) )
+            else if ( "never".equals( styleColor ) )
             {
-                slf4jLogger.info( "Build failures were ignored." );
-
-                return 0;
+                MessageUtils.setColorEnabled( false );
             }
-            else
+            else if ( !"auto".equals( styleColor ) )
             {
-                return 1;
+                throw new IllegalArgumentException( "Invalid color configuration option [" + styleColor
+                    + "]. Supported values are (auto|always|never)." );
+            }
+            else if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE )
+                || cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
+            {
+                MessageUtils.setColorEnabled( false );
             }
-        }
-        else
-        {
-            return 0;
-        }
-    }
 
-    /**
-     * A helper method to determine the value to resume the build with {@code -rf} taking into account the
-     * edge case where multiple modules in the reactor have the same artifactId.
-     * <p>
-     * {@code -rf :artifactId} will pick up the first module which matches, but when multiple modules in the
-     * reactor have the same artifactId, effective failed module might be later in build reactor.
-     * This means that developer will either have to type groupId or wait for build execution of all modules
-     * which were fine, but they are still before one which reported errors.
-     * <p>Then the returned value is {@code groupId:artifactId} when there is a name clash and
-     * {@code :artifactId} if there is no conflict.
-     *
-     * @param mavenProjects Maven projects which are part of build execution.
-     * @param failedProject Project which has failed.
-     * @return Value for -rf flag to resume build exactly from place where it failed ({@code :artifactId} in
-     *    general and {@code groupId:artifactId} when there is a name clash).
-     */
-    private String getResumeFrom(List<MavenProject> mavenProjects, MavenProject failedProject )
-    {
-        for ( MavenProject buildProject : mavenProjects )
-        {
-            if ( failedProject.getArtifactId().equals( buildProject.getArtifactId() ) && !failedProject.equals(
-                    buildProject ) )
+            // LOG STREAMS
+            if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
             {
-                return failedProject.getGroupId() + ":" + failedProject.getArtifactId();
+                File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) );
+                logFile = resolveFile( logFile, cliRequest.workingDirectory );
+
+                // redirect stdout and stderr to file
+                try
+                {
+                    PrintStream ps = new PrintStream( new FileOutputStream( logFile ) );
+                    System.setOut( ps );
+                    System.setErr( ps );
+                }
+                catch ( FileNotFoundException e )
+                {
+                    //
+                    // Ignore
+                    //
+                }
             }
-        }
-        return ":" + failedProject.getArtifactId();
-    }
 
-    private void logSummary(ExceptionSummary summary, Map<String, String> references, String indent,
-                            boolean showErrors )
-    {
-        String referenceKey = "";
+        }
 
-        if ( StringUtils.isNotEmpty( summary.getReference() ) )
+        private void version( CliRequest cliRequest ) throws ExitException
         {
-            referenceKey = references.get( summary.getReference() );
-            if ( referenceKey == null )
+            if ( cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.VERSION ) )
             {
-                referenceKey = "[Help " + ( references.size() + 1 ) + "]";
-                references.put( summary.getReference(), referenceKey );
+                AbstractLoggingSpy.instance().append(null, CLIReportingUtils.showVersion());
+                if (cliRequest.commandLine.hasOption( CLIManager.VERSION )) {
+                    throw new ExitException( 0 );
+                }
             }
         }
 
-        String msg = summary.getMessage();
-
-        if ( StringUtils.isNotEmpty( referenceKey ) )
+        private void commands( CliRequest cliRequest )
         {
-            if ( msg.indexOf( '\n' ) < 0 )
+            if ( cliRequest.showErrors )
             {
-                msg += " -> " + buffer().strong( referenceKey );
+                slf4jLogger.info( "Error stacktraces are turned on." );
             }
-            else
+
+            if ( MavenExecutionRequest.CHECKSUM_POLICY_WARN.equals( cliRequest.request.getGlobalChecksumPolicy() ) )
             {
-                msg += "\n-> " + buffer().strong( referenceKey );
+                slf4jLogger.info( "Disabling strict checksum verification on all artifact downloads." );
+            }
+            else if ( MavenExecutionRequest.CHECKSUM_POLICY_FAIL.equals( cliRequest.request.getGlobalChecksumPolicy() ) )
+            {
+                slf4jLogger.info( "Enabling strict checksum verification on all artifact downloads." );
             }
-        }
-
-        String[] lines = msg.split( "(\r\n)|(\r)|(\n)" );
-        String currentColor = "";
-
-        for ( int i = 0; i < lines.length; i++ )
-        {
-            // add eventual current color inherited from previous line
-            String line = currentColor + lines[i];
 
-            // look for last ANSI escape sequence to check if nextColor
-            Matcher matcher = LAST_ANSI_SEQUENCE.matcher( line );
-            String nextColor = "";
-            if ( matcher.find() )
+            if ( slf4jLogger.isDebugEnabled() )
             {
-                nextColor = matcher.group( 1 );
-                if ( ANSI_RESET.equals( nextColor ) )
+                slf4jLogger.debug( "Message scheme: {}", ( MessageUtils.isColorEnabled() ? "color" : "plain" ) );
+                if ( MessageUtils.isColorEnabled() )
                 {
-                    // last ANSI escape code is reset: no next color
-                    nextColor = "";
+                    MessageBuilder buff = MessageUtils.buffer();
+                    buff.a( "Message styles: " );
+                    buff.a( MessageUtils.level().debug( "debug" ) ).a( ' ' );
+                    buff.a( MessageUtils.level().info( "info" ) ).a( ' ' );
+                    buff.a( MessageUtils.level().warning( "warning" ) ).a( ' ' );
+                    buff.a( MessageUtils.level().error( "error" ) ).a( ' ' );
+
+                    buff.success( "success" ).a( ' ' );
+                    buff.failure( "failure" ).a( ' ' );
+                    buff.strong( "strong" ).a( ' ' );
+                    buff.mojo( "mojo" ).a( ' ' );
+                    buff.project( "project" );
+                    slf4jLogger.debug( buff.toString() );
                 }
             }
+        }
 
-            // effective line, with indent and reset if end is colored
-            line = indent + line + ( "".equals( nextColor ) ? "" : ANSI_RESET );
+        //Needed to make this method package visible to make writing a unit test possible
+        //Maybe it's better to move some of those methods to separate class (SoC).
+        void properties( CliRequest cliRequest )
+        {
+            populateProperties( cliRequest.commandLine, cliRequest.systemProperties, cliRequest.userProperties );
+        }
 
-            if ( ( i == lines.length - 1 ) && ( showErrors
-                || ( summary.getException() instanceof InternalErrorException ) ) )
+        //
+        // This should probably be a separate tool and not be baked into Maven.
+        //
+        private void encryption( CliRequest cliRequest )
+            throws Exception
+        {
+            if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_MASTER_PASSWORD ) )
             {
-                slf4jLogger.error( line, summary.getException() );
+                throw new UnsupportedOperationException( "Unsupported option: " + CLIManager.ENCRYPT_MASTER_PASSWORD );
             }
-            else
+            else if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_PASSWORD ) )
             {
-                slf4jLogger.error( line );
+                throw new UnsupportedOperationException( "Unsupported option: " + CLIManager.ENCRYPT_PASSWORD );
             }
-
-            currentColor = nextColor;
         }
 
-        indent += "  ";
-
-        for ( ExceptionSummary child : summary.getChildren() )
+        private void configure(CliRequest cliRequest)
+            throws Exception
         {
-            logSummary( child, references, indent, showErrors );
-        }
-    }
+            //
+            // This is not ideal but there are events specifically for configuration from the CLI which I don't
+            // believe are really valid but there are ITs which assert the right events are published so this
+            // needs to be supported so the EventSpyDispatcher needs to be put in the CliRequest so that
+            // it can be accessed by configuration processors.
+            //
+            cliRequest.request.setEventSpyDispatcher( eventSpyDispatcher );
 
-    private static final Pattern LAST_ANSI_SEQUENCE = Pattern.compile( "(\u001B\\[[;\\d]*[ -/]*[@-~])[^\u001B]*$" );
+            Map<String, Object> data = new HashMap<>();
+            data.put( "plexus", container );
+            data.put( "workingDirectory", cliRequest.workingDirectory );
+            data.put( "systemProperties", cliRequest.systemProperties );
+            data.put( "userProperties", cliRequest.userProperties );
+            data.put( "versionProperties", CLIReportingUtils.getBuildProperties() );
+            eventSpyDispatcher.init( () -> data );
 
-    private static final String ANSI_RESET = "\u001B\u005Bm";
+            //
+            // We expect at most 2 implementations to be available. The SettingsXmlConfigurationProcessor implementation
+            // is always available in the core and likely always will be, but we may have another ConfigurationProcessor
+            // present supplied by the user. The rule is that we only allow the execution of one ConfigurationProcessor.
+            // If there is more than one then we execute the one supplied by the user, otherwise we execute the
+            // the default SettingsXmlConfigurationProcessor.
+            //
+            int userSuppliedConfigurationProcessorCount = configurationProcessors.size() - 1;
 
-    private void configure(CliRequest cliRequest)
-        throws Exception
-    {
-        //
-        // This is not ideal but there are events specifically for configuration from the CLI which I don't
-        // believe are really valid but there are ITs which assert the right events are published so this
-        // needs to be supported so the EventSpyDispatcher needs to be put in the CliRequest so that
-        // it can be accessed by configuration processors.
-        //
-        cliRequest.request.setEventSpyDispatcher( eventSpyDispatcher );
-
-        Map<String, Object> data = new HashMap<>();
-        data.put( "plexus", container );
-        data.put( "workingDirectory", cliRequest.workingDirectory );
-        data.put( "systemProperties", cliRequest.systemProperties );
-        data.put( "userProperties", cliRequest.userProperties );
-        data.put( "versionProperties", CLIReportingUtils.getBuildProperties() );
-        eventSpyDispatcher.init( () -> data );
-
-        //
-        // We expect at most 2 implementations to be available. The SettingsXmlConfigurationProcessor implementation
-        // is always available in the core and likely always will be, but we may have another ConfigurationProcessor
-        // present supplied by the user. The rule is that we only allow the execution of one ConfigurationProcessor.
-        // If there is more than one then we execute the one supplied by the user, otherwise we execute the
-        // the default SettingsXmlConfigurationProcessor.
-        //
-        int userSuppliedConfigurationProcessorCount = configurationProcessors.size() - 1;
-
-        if ( userSuppliedConfigurationProcessorCount == 0 )
-        {
-            //
-            // Our settings.xml source is historically how we have configured Maven from the CLI so we are going to
-            // have to honour its existence forever. So let's run it.
-            //
-            configurationProcessors.get( SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
-        }
-        else if ( userSuppliedConfigurationProcessorCount == 1 )
-        {
-            //
-            // Run the user supplied ConfigurationProcessor
-            //
-            for ( Entry<String, ConfigurationProcessor> entry : configurationProcessors.entrySet() )
+            if ( userSuppliedConfigurationProcessorCount == 0 )
             {
-                String hint = entry.getKey();
-                if ( !hint.equals( SettingsXmlConfigurationProcessor.HINT ) )
+                //
+                // Our settings.xml source is historically how we have configured Maven from the CLI so we are going to
+                // have to honour its existence forever. So let's run it.
+                //
+                configurationProcessors.get( SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
+            }
+            else if ( userSuppliedConfigurationProcessorCount == 1 )
+            {
+                //
+                // Run the user supplied ConfigurationProcessor
+                //
+                for ( Entry<String, ConfigurationProcessor> entry : configurationProcessors.entrySet() )
                 {
-                    ConfigurationProcessor configurationProcessor = entry.getValue();
-                    configurationProcessor.process( cliRequest );
+                    String hint = entry.getKey();
+                    if ( !hint.equals( SettingsXmlConfigurationProcessor.HINT ) )
+                    {
+                        ConfigurationProcessor configurationProcessor = entry.getValue();
+                        configurationProcessor.process( cliRequest );
+                    }
                 }
             }
-        }
-        else if ( userSuppliedConfigurationProcessorCount > 1 )
-        {
-            //
-            // There are too many ConfigurationProcessors so we don't know which one to run so report the error.
-            //
-            StringBuilder sb = new StringBuilder(
-                String.format( "\nThere can only be one user supplied ConfigurationProcessor, there are %s:\n\n",
-                               userSuppliedConfigurationProcessorCount ) );
-            for ( Entry<String, ConfigurationProcessor> entry : configurationProcessors.entrySet() )
+            else if ( userSuppliedConfigurationProcessorCount > 1 )
             {
-                String hint = entry.getKey();
-                if ( !hint.equals( SettingsXmlConfigurationProcessor.HINT ) )
+                //
+                // There are too many ConfigurationProcessors so we don't know which one to run so report the error.
+                //
+                StringBuilder sb = new StringBuilder(
+                    String.format( "\nThere can only be one user supplied ConfigurationProcessor, there are %s:\n\n",
+                                   userSuppliedConfigurationProcessorCount ) );
+                for ( Entry<String, ConfigurationProcessor> entry : configurationProcessors.entrySet() )
                 {
-                    ConfigurationProcessor configurationProcessor = entry.getValue();
-                    sb.append( String.format( "%s\n", configurationProcessor.getClass().getName() ) );
+                    String hint = entry.getKey();
+                    if ( !hint.equals( SettingsXmlConfigurationProcessor.HINT ) )
+                    {
+                        ConfigurationProcessor configurationProcessor = entry.getValue();
+                        sb.append( String.format( "%s\n", configurationProcessor.getClass().getName() ) );
+                    }
                 }
+                sb.append( "\n" );
+                throw new Exception( sb.toString() );
             }
-            sb.append( "\n" );
-            throw new Exception( sb.toString() );
         }
-    }
 
-    void toolchains( CliRequest cliRequest )
-        throws Exception
-    {
-        File userToolchainsFile;
-
-        if ( cliRequest.commandLine.hasOption( CLIManager.ALTERNATE_USER_TOOLCHAINS ) )
+        void toolchains( CliRequest cliRequest )
+            throws Exception
         {
-            userToolchainsFile =
-                new File( cliRequest.commandLine.getOptionValue( CLIManager.ALTERNATE_USER_TOOLCHAINS ) );
-            userToolchainsFile = resolveFile( userToolchainsFile, cliRequest.workingDirectory );
+            File userToolchainsFile;
 
-            if ( !userToolchainsFile.isFile() )
+            if ( cliRequest.commandLine.hasOption( CLIManager.ALTERNATE_USER_TOOLCHAINS ) )
             {
-                throw new FileNotFoundException(
-                    "The specified user toolchains file does not exist: " + userToolchainsFile );
+                userToolchainsFile =
+                    new File( cliRequest.commandLine.getOptionValue( CLIManager.ALTERNATE_USER_TOOLCHAINS ) );
+                userToolchainsFile = resolveFile( userToolchainsFile, cliRequest.workingDirectory );
+
+                if ( !userToolchainsFile.isFile() )
+                {
+                    throw new FileNotFoundException(
+                        "The specified user toolchains file does not exist: " + userToolchainsFile );
+                }
+            }
+            else
+            {
+                userToolchainsFile = DEFAULT_USER_TOOLCHAINS_FILE;
             }
-        }
-        else
-        {
-            userToolchainsFile = DEFAULT_USER_TOOLCHAINS_FILE;
-        }
 
-        File globalToolchainsFile;
+            File globalToolchainsFile;
 
-        if ( cliRequest.commandLine.hasOption( CLIManager.ALTERNATE_GLOBAL_TOOLCHAINS ) )
-        {
-            globalToolchainsFile =
-                new File( cliRequest.commandLine.getOptionValue( CLIManager.ALTERNATE_GLOBAL_TOOLCHAINS ) );
-            globalToolchainsFile = resolveFile( globalToolchainsFile, cliRequest.workingDirectory );
+            if ( cliRequest.commandLine.hasOption( CLIManager.ALTERNATE_GLOBAL_TOOLCHAINS ) )
+            {
+                globalToolchainsFile =
+                    new File( cliRequest.commandLine.getOptionValue( CLIManager.ALTERNATE_GLOBAL_TOOLCHAINS ) );
+                globalToolchainsFile = resolveFile( globalToolchainsFile, cliRequest.workingDirectory );
 
-            if ( !globalToolchainsFile.isFile() )
+                if ( !globalToolchainsFile.isFile() )
+                {
+                    throw new FileNotFoundException(
+                        "The specified global toolchains file does not exist: " + globalToolchainsFile );
+                }
+            }
+            else
             {
-                throw new FileNotFoundException(
-                    "The specified global toolchains file does not exist: " + globalToolchainsFile );
+                globalToolchainsFile = DEFAULT_GLOBAL_TOOLCHAINS_FILE;
             }
-        }
-        else
-        {
-            globalToolchainsFile = DEFAULT_GLOBAL_TOOLCHAINS_FILE;
-        }
 
-        cliRequest.request.setGlobalToolchainsFile( globalToolchainsFile );
-        cliRequest.request.setUserToolchainsFile( userToolchainsFile );
+            cliRequest.request.setGlobalToolchainsFile( globalToolchainsFile );
+            cliRequest.request.setUserToolchainsFile( userToolchainsFile );
 
-        DefaultToolchainsBuildingRequest toolchainsRequest = new DefaultToolchainsBuildingRequest();
-        if ( globalToolchainsFile.isFile() )
-        {
-            toolchainsRequest.setGlobalToolchainsSource( new FileSource( globalToolchainsFile ) );
-        }
-        if ( userToolchainsFile.isFile() )
-        {
-            toolchainsRequest.setUserToolchainsSource( new FileSource( userToolchainsFile ) );
-        }
-
-        eventSpyDispatcher.onEvent( toolchainsRequest );
+            DefaultToolchainsBuildingRequest toolchainsRequest = new DefaultToolchainsBuildingRequest();
+            if ( globalToolchainsFile.isFile() )
+            {
+                toolchainsRequest.setGlobalToolchainsSource( new FileSource( globalToolchainsFile ) );
+            }
+            if ( userToolchainsFile.isFile() )
+            {
+                toolchainsRequest.setUserToolchainsSource( new FileSource( userToolchainsFile ) );
+            }
 
-        slf4jLogger.debug( "Reading global toolchains from {}",
-                getLocation( toolchainsRequest.getGlobalToolchainsSource(), globalToolchainsFile ) );
-        slf4jLogger.debug( "Reading user toolchains from {}",
-                getLocation( toolchainsRequest.getUserToolchainsSource(), userToolchainsFile ) );
+            eventSpyDispatcher.onEvent( toolchainsRequest );
 
-        ToolchainsBuildingResult toolchainsResult = toolchainsBuilder.build( toolchainsRequest );
+            slf4jLogger.debug( "Reading global toolchains from {}",
+                    getLocation( toolchainsRequest.getGlobalToolchainsSource(), globalToolchainsFile ) );
+            slf4jLogger.debug( "Reading user toolchains from {}",
+                    getLocation( toolchainsRequest.getUserToolchainsSource(), userToolchainsFile ) );
 
-        eventSpyDispatcher.onEvent( toolchainsResult );
+            ToolchainsBuildingResult toolchainsResult = toolchainsBuilder.build( toolchainsRequest );
 
-        executionRequestPopulator.populateFromToolchains( cliRequest.request,
-                                                          toolchainsResult.getEffectiveToolchains() );
+            eventSpyDispatcher.onEvent( toolchainsResult );
 
-        if ( !toolchainsResult.getProblems().isEmpty() && slf4jLogger.isWarnEnabled() )
-        {
-            slf4jLogger.warn( "" );
-            slf4jLogger.warn( "Some problems were encountered while building the effective toolchains" );
+            executionRequestPopulator.populateFromToolchains( cliRequest.request,
+                                                              toolchainsResult.getEffectiveToolchains() );
 
-            for ( Problem problem : toolchainsResult.getProblems() )
+            if ( !toolchainsResult.getProblems().isEmpty() && slf4jLogger.isWarnEnabled() )
             {
-                slf4jLogger.warn( "{} @ {}", problem.getMessage(), problem.getLocation() );
-            }
+                slf4jLogger.warn( "" );
+                slf4jLogger.warn( "Some problems were encountered while building the effective toolchains" );
 
-            slf4jLogger.warn( "" );
-        }
-    }
+                for ( Problem problem : toolchainsResult.getProblems() )
+                {
+                    slf4jLogger.warn( "{} @ {}", problem.getMessage(), problem.getLocation() );
+                }
 
-    private Object getLocation(Source source, File defaultLocation )
-    {
-        if ( source != null )
-        {
-            return source.getLocation();
+                slf4jLogger.warn( "" );
+            }
         }
-        return defaultLocation;
-    }
 
-    private void populateRequest( CliRequest cliRequest )
-    {
-        MavenExecutionRequest request = cliRequest.request;
-        CommandLine commandLine = cliRequest.commandLine;
-        String workingDirectory = cliRequest.workingDirectory;
-        boolean quiet = cliRequest.quiet;
-        boolean showErrors = cliRequest.showErrors;
-
-        String[] deprecatedOptions = { "up", "npu", "cpu", "npr" };
-        for ( String deprecatedOption : deprecatedOptions )
+        private void populateRequest( CliRequest cliRequest )
         {
-            if ( commandLine.hasOption( deprecatedOption ) )
+            MavenExecutionRequest request = cliRequest.request;
+            CommandLine commandLine = cliRequest.commandLine;
+            String workingDirectory = cliRequest.workingDirectory;
+            boolean quiet = cliRequest.quiet;
+            boolean showErrors = cliRequest.showErrors;
+
+            String[] deprecatedOptions = { "up", "npu", "cpu", "npr" };
+            for ( String deprecatedOption : deprecatedOptions )
             {
-                slf4jLogger.warn( "Command line option -{} is deprecated and will be removed in future Maven versions.",
-                        deprecatedOption );
+                if ( commandLine.hasOption( deprecatedOption ) )
+                {
+                    slf4jLogger.warn( "Command line option -{} is deprecated and will be removed in future Maven versions.",
+                            deprecatedOption );
+                }
             }
-        }
 
-        // ----------------------------------------------------------------------
-        // Now that we have everything that we need we will fire up plexus and
-        // bring the maven component to life for use.
-        // ----------------------------------------------------------------------
+            // ----------------------------------------------------------------------
+            // Now that we have everything that we need we will fire up plexus and
+            // bring the maven component to life for use.
+            // ----------------------------------------------------------------------
 
-        if ( commandLine.hasOption( CLIManager.BATCH_MODE ) )
-        {
-            request.setInteractiveMode( false );
-        }
+            if ( commandLine.hasOption( CLIManager.BATCH_MODE ) )
+            {
+                request.setInteractiveMode( false );
+            }
 
-        boolean noSnapshotUpdates = false;
-        if ( commandLine.hasOption( CLIManager.SUPRESS_SNAPSHOT_UPDATES ) )
-        {
-            noSnapshotUpdates = true;
-        }
+            boolean noSnapshotUpdates = false;
+            if ( commandLine.hasOption( CLIManager.SUPRESS_SNAPSHOT_UPDATES ) )
+            {
+                noSnapshotUpdates = true;
+            }
 
-        // ----------------------------------------------------------------------
-        //
-        // ----------------------------------------------------------------------
+            // ----------------------------------------------------------------------
+            //
+            // ----------------------------------------------------------------------
 
-        List<String> goals = commandLine.getArgList();
+            List<String> goals = commandLine.getArgList();
 
-        boolean recursive = true;
+            boolean recursive = true;
 
-        // this is the default behavior.
-        String reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_FAST;
+            // this is the default behavior.
+            String reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_FAST;
 
-        if ( commandLine.hasOption( CLIManager.NON_RECURSIVE ) )
-        {
-            recursive = false;
-        }
+            if ( commandLine.hasOption( CLIManager.NON_RECURSIVE ) )
+            {
+                recursive = false;
+            }
 
-        if ( commandLine.hasOption( CLIManager.FAIL_FAST ) )
-        {
-            reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_FAST;
-        }
-        else if ( commandLine.hasOption( CLIManager.FAIL_AT_END ) )
-        {
-            reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_AT_END;
-        }
-        else if ( commandLine.hasOption( CLIManager.FAIL_NEVER ) )
-        {
-            reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_NEVER;
-        }
+            if ( commandLine.hasOption( CLIManager.FAIL_FAST ) )
+            {
+                reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_FAST;
+            }
+            else if ( commandLine.hasOption( CLIManager.FAIL_AT_END ) )
+            {
+                reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_AT_END;
+            }
+            else if ( commandLine.hasOption( CLIManager.FAIL_NEVER ) )
+            {
+                reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_NEVER;
+            }
 
-        if ( commandLine.hasOption( CLIManager.OFFLINE ) )
-        {
-            request.setOffline( true );
-        }
+            if ( commandLine.hasOption( CLIManager.OFFLINE ) )
+            {
+                request.setOffline( true );
+            }
 
-        boolean updateSnapshots = false;
+            boolean updateSnapshots = false;
 
-        if ( commandLine.hasOption( CLIManager.UPDATE_SNAPSHOTS ) )
-        {
-            updateSnapshots = true;
-        }
+            if ( commandLine.hasOption( CLIManager.UPDATE_SNAPSHOTS ) )
+            {
+                updateSnapshots = true;
+            }
 
-        String globalChecksumPolicy = null;
+            String globalChecksumPolicy = null;
 
-        if ( commandLine.hasOption( CLIManager.CHECKSUM_FAILURE_POLICY ) )
-        {
-            globalChecksumPolicy = MavenExecutionRequest.CHECKSUM_POLICY_FAIL;
-        }
-        else if ( commandLine.hasOption( CLIManager.CHECKSUM_WARNING_POLICY ) )
-        {
-            globalChecksumPolicy = MavenExecutionRequest.CHECKSUM_POLICY_WARN;
-        }
+            if ( commandLine.hasOption( CLIManager.CHECKSUM_FAILURE_POLICY ) )
+            {
+                globalChecksumPolicy = MavenExecutionRequest.CHECKSUM_POLICY_FAIL;
+            }
+            else if ( commandLine.hasOption( CLIManager.CHECKSUM_WARNING_POLICY ) )
+            {
+                globalChecksumPolicy = MavenExecutionRequest.CHECKSUM_POLICY_WARN;
+            }
 
-        File baseDirectory = new File( workingDirectory, "" ).getAbsoluteFile();
+            File baseDirectory = new File( workingDirectory, "" ).getAbsoluteFile();
 
-        // ----------------------------------------------------------------------
-        // Profile Activation
-        // ----------------------------------------------------------------------
+            // ----------------------------------------------------------------------
+            // Profile Activation
+            // ----------------------------------------------------------------------
 
-        List<String> activeProfiles = new ArrayList<>();
+            List<String> activeProfiles = new ArrayList<>();
 
-        List<String> inactiveProfiles = new ArrayList<>();
+            List<String> inactiveProfiles = new ArrayList<>();
 
-        if ( commandLine.hasOption( CLIManager.ACTIVATE_PROFILES ) )
-        {
-            String[] profileOptionValues = commandLine.getOptionValues( CLIManager.ACTIVATE_PROFILES );
-            if ( profileOptionValues != null )
+            if ( commandLine.hasOption( CLIManager.ACTIVATE_PROFILES ) )
             {
-                for ( String profileOptionValue : profileOptionValues )
+                String[] profileOptionValues = commandLine.getOptionValues( CLIManager.ACTIVATE_PROFILES );
+                if ( profileOptionValues != null )
                 {
-                    StringTokenizer profileTokens = new StringTokenizer( profileOptionValue, "," );
-
-                    while ( profileTokens.hasMoreTokens() )
+                    for ( String profileOptionValue : profileOptionValues )
                     {
-                        String profileAction = profileTokens.nextToken().trim();
+                        StringTokenizer profileTokens = new StringTokenizer( profileOptionValue, "," );
 
-                        if ( profileAction.startsWith( "-" ) || profileAction.startsWith( "!" ) )
-                        {
-                            inactiveProfiles.add( profileAction.substring( 1 ) );
-                        }
-                        else if ( profileAction.startsWith( "+" ) )
+                        while ( profileTokens.hasMoreTokens() )
                         {
-                            activeProfiles.add( profileAction.substring( 1 ) );
-                        }
-                        else
-                        {
-                            activeProfiles.add( profileAction );
+                            String profileAction = profileTokens.nextToken().trim();
+
+                            if ( profileAction.startsWith( "-" ) || profileAction.startsWith( "!" ) )
+                            {
+                                inactiveProfiles.add( profileAction.substring( 1 ) );
+                            }
+                            else if ( profileAction.startsWith( "+" ) )
+                            {
+                                activeProfiles.add( profileAction.substring( 1 ) );
+                            }
+                            else
+                            {
+                                activeProfiles.add( profileAction );
+                            }
                         }
                     }
                 }
             }
-        }
-
-        TransferListener transferListener;
-
-        if ( quiet || cliRequest.commandLine.hasOption( CLIManager.NO_TRANSFER_PROGRESS ) )
-        {
-            transferListener = new QuietMavenTransferListener();
-        }
-        else if ( request.isInteractiveMode() && !cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
-        {
-            //
-            // If we're logging to a file then we don't want the console transfer listener as it will spew
-            // download progress all over the place
-            //
-            transferListener = getConsoleTransferListener( cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
-        }
-        else
-        {
-            transferListener = getBatchTransferListener();
-        }
 
-        ExecutionListener executionListener = new ExecutionEventLogger();
-        if ( eventSpyDispatcher != null )
-        {
-            executionListener = eventSpyDispatcher.chainListener( executionListener );
-        }
+            TransferListener transferListener;
 
-        String alternatePomFile = null;
-        if ( commandLine.hasOption( CLIManager.ALTERNATE_POM_FILE ) )
-        {
-            alternatePomFile = commandLine.getOptionValue( CLIManager.ALTERNATE_POM_FILE );
-        }
+            if ( quiet || cliRequest.commandLine.hasOption( CLIManager.NO_TRANSFER_PROGRESS ) )
+            {
+                transferListener = new QuietMavenTransferListener();
+            }
+            else if ( request.isInteractiveMode() && !cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
+            {
+                //
+                // If we're logging to a file then we don't want the console transfer listener as it will spew
+                // download progress all over the place
+                //
+                transferListener = getConsoleTransferListener( cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
+            }
+            else
+            {
+                transferListener = getBatchTransferListener();
+            }
 
-        request.setBaseDirectory( baseDirectory ).setGoals( goals ).setSystemProperties(
-            cliRequest.systemProperties ).setUserProperties( cliRequest.userProperties ).setReactorFailureBehavior(
-            reactorFailureBehaviour ) // default: fail fast
-            .setRecursive( recursive ) // default: true
-            .setShowErrors( showErrors ) // default: false
-            .addActiveProfiles( activeProfiles ) // optional
-            .addInactiveProfiles( inactiveProfiles ) // optional
-            .setExecutionListener( executionListener ).setTransferListener(
-            transferListener ) // default: batch mode which goes along with interactive
-            .setUpdateSnapshots( updateSnapshots ) // default: false
-            .setNoSnapshotUpdates( noSnapshotUpdates ) // default: false
-            .setGlobalChecksumPolicy( globalChecksumPolicy ) // default: warn
-            .setMultiModuleProjectDirectory( cliRequest.getMultiModuleProjectDirectory() );
-
-        if ( alternatePomFile != null )
-        {
-            File pom = resolveFile( new File( alternatePomFile ), workingDirectory );
-            if ( pom.isDirectory() )
+            ExecutionListener executionListener = new ExecutionEventLogger();
+            if ( eventSpyDispatcher != null )
             {
-                pom = new File( pom, "pom.xml" );
+                executionListener = eventSpyDispatcher.chainListener( executionListener );
             }
 
-            request.setPom( pom );
-        }
-        else if ( modelProcessor != null )
-        {
-            File pom = modelProcessor.locatePom( baseDirectory );
+            String alternatePomFile = null;
+            if ( commandLine.hasOption( CLIManager.ALTERNATE_POM_FILE ) )
+            {
+                alternatePomFile = commandLine.getOptionValue( CLIManager.ALTERNATE_POM_FILE );
+            }
 
-            if ( pom.isFile() )
+            request.setBaseDirectory( baseDirectory ).setGoals( goals ).setSystemProperties(
+                cliRequest.systemProperties ).setUserProperties( cliRequest.userProperties ).setReactorFailureBehavior(
+                reactorFailureBehaviour ) // default: fail fast
+                .setRecursive( recursive ) // default: true
+                .setShowErrors( showErrors ) // default: false
+                .addActiveProfiles( activeProfiles ) // optional
+                .addInactiveProfiles( inactiveProfiles ) // optional
+                .setExecutionListener( executionListener ).setTransferListener(
+                transferListener ) // default: batch mode which goes along with interactive
+                .setUpdateSnapshots( updateSnapshots ) // default: false
+                .setNoSnapshotUpdates( noSnapshotUpdates ) // default: false
+                .setGlobalChecksumPolicy( globalChecksumPolicy ) // default: warn
+                .setMultiModuleProjectDirectory( cliRequest.getMultiModuleProjectDirectory() );
+
+            if ( alternatePomFile != null )
             {
+                File pom = resolveFile( new File( alternatePomFile ), workingDirectory );
+                if ( pom.isDirectory() )
+                {
+                    pom = new File( pom, "pom.xml" );
+                }
+
                 request.setPom( pom );
             }
-        }
-
-        if ( ( request.getPom() != null ) && ( request.getPom().getParentFile() != null ) )
-        {
-            request.setBaseDirectory( request.getPom().getParentFile() );
-        }
+            else if ( modelProcessor != null )
+            {
+                File pom = modelProcessor.locatePom( baseDirectory );
 
-        if ( commandLine.hasOption( CLIManager.RESUME_FROM ) )
-        {
-            request.setResumeFrom( commandLine.getOptionValue( CLIManager.RESUME_FROM ) );
-        }
+                if ( pom.isFile() )
+                {
+                    request.setPom( pom );
+                }
+            }
 
-        if ( commandLine.hasOption( CLIManager.PROJECT_LIST ) )
-        {
-            String[] projectOptionValues = commandLine.getOptionValues( CLIManager.PROJECT_LIST );
+            if ( ( request.getPom() != null ) && ( request.getPom().getParentFile() != null ) )
+            {
+                request.setBaseDirectory( request.getPom().getParentFile() );
+            }
 
-            List<String> inclProjects = new ArrayList<>();
-            List<String> exclProjects = new ArrayList<>();
+            if ( commandLine.hasOption( CLIManager.RESUME_FROM ) )
+            {
+                request.setResumeFrom( commandLine.getOptionValue( CLIManager.RESUME_FROM ) );
+            }
 
-            if ( projectOptionValues != null )
+            if ( commandLine.hasOption( CLIManager.PROJECT_LIST ) )
             {
-                for ( String projectOptionValue : projectOptionValues )
-                {
-                    StringTokenizer projectTokens = new StringTokenizer( projectOptionValue, "," );
+                String[] projectOptionValues = commandLine.getOptionValues( CLIManager.PROJECT_LIST );
+
+                List<String> inclProjects = new ArrayList<>();
+                List<String> exclProjects = new ArrayList<>();
 
-                    while ( projectTokens.hasMoreTokens() )
+                if ( projectOptionValues != null )
+                {
+                    for ( String projectOptionValue : projectOptionValues )
                     {
-                        String projectAction = projectTokens.nextToken().trim();
+                        StringTokenizer projectTokens = new StringTokenizer( projectOptionValue, "," );
 
-                        if ( projectAction.startsWith( "-" ) || projectAction.startsWith( "!" ) )
-                        {
-                            exclProjects.add( projectAction.substring( 1 ) );
-                        }
-                        else if ( projectAction.startsWith( "+" ) )
-                        {
-                            inclProjects.add( projectAction.substring( 1 ) );
-                        }
-                        else
+                        while ( projectTokens.hasMoreTokens() )
                         {
-                            inclProjects.add( projectAction );
+                            String projectAction = projectTokens.nextToken().trim();
+
+                            if ( projectAction.startsWith( "-" ) || projectAction.startsWith( "!" ) )
+                            {
+                                exclProjects.add( projectAction.substring( 1 ) );
+                            }
+                            else if ( projectAction.startsWith( "+" ) )
+                            {
+                                inclProjects.add( projectAction.substring( 1 ) );
+                            }
+                            else
+                            {
+                                inclProjects.add( projectAction );
+                            }
                         }
                     }
                 }
-            }
-
-            request.setSelectedProjects( inclProjects );
-            request.setExcludedProjects( exclProjects );
-        }
 
-        if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) && !commandLine.hasOption(
-            CLIManager.ALSO_MAKE_DEPENDENTS ) )
-        {
-            request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_UPSTREAM );
-        }
-        else if ( !commandLine.hasOption( CLIManager.ALSO_MAKE ) && commandLine.hasOption(
-            CLIManager.ALSO_MAKE_DEPENDENTS ) )
-        {
-            request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_DOWNSTREAM );
-        }
-        else if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) && commandLine.hasOption(
-            CLIManager.ALSO_MAKE_DEPENDENTS ) )
-        {
-            request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_BOTH );
-        }
+                request.setSelectedProjects( inclProjects );
+                request.setExcludedProjects( exclProjects );
+            }
 
-        String localRepoProperty = request.getUserProperties().getProperty( MavenCli.LOCAL_REPO_PROPERTY );
+            if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) && !commandLine.hasOption(
+                CLIManager.ALSO_MAKE_DEPENDENTS ) )
+            {
+                request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_UPSTREAM );
+            }
+            else if ( !commandLine.hasOption( CLIManager.ALSO_MAKE ) && commandLine.hasOption(
+                CLIManager.ALSO_MAKE_DEPENDENTS ) )
+            {
+                request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_DOWNSTREAM );
+            }
+            else if ( commandLine.hasOption( CLIManager.ALSO_MAKE ) && commandLine.hasOption(
+                CLIManager.ALSO_MAKE_DEPENDENTS ) )
+            {
+                request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_BOTH );
+            }
 
-        if ( localRepoProperty == null )
-        {
-            localRepoProperty = request.getSystemProperties().getProperty( MavenCli.LOCAL_REPO_PROPERTY );
-        }
+            String localRepoProperty = request.getUserProperties().getProperty( MavenCli.LOCAL_REPO_PROPERTY );
 
-        if ( localRepoProperty != null )
-        {
-            request.setLocalRepositoryPath( localRepoProperty );
-        }
+            if ( localRepoProperty == null )
+            {
+                localRepoProperty = request.getSystemProperties().getProperty( MavenCli.LOCAL_REPO_PROPERTY );
+            }
 
-        request.setCacheNotFound( true );
-        request.setCacheTransferError( false );
+            if ( localRepoProperty != null )
+            {
+                request.setLocalRepositoryPath( localRepoProperty );
+            }
 
-        //
-        // Builder, concurrency and parallelism
-        //
-        // We preserve the existing methods for builder selection which is to look for various inputs in the threading
-        // configuration. We don't have an easy way to allow a pluggable builder to provide its own configuration
-        // parameters but this is sufficient for now. Ultimately we want components like Builders to provide a way to
-        // extend the command line to accept its own configuration parameters.
-        //
-        final String threadConfiguration = commandLine.hasOption( CLIManager.THREADS )
-            ? commandLine.getOptionValue( CLIManager.THREADS )
-            : null;
+            request.setCacheNotFound( true );
+            request.setCacheTransferError( false );
 
-        if ( threadConfiguration != null )
-        {
             //
-            // Default to the standard multithreaded builder
+            // Builder, concurrency and parallelism
+            //
+            // We preserve the existing methods for builder selection which is to look for various inputs in the threading
+            // configuration. We don't have an easy way to allow a pluggable builder to provide its own configuration
+            // parameters but this is sufficient for now. Ultimately we want components like Builders to provide a way to
+            // extend the command line to accept its own configuration parameters.
             //
-            request.setBuilderId( "multithreaded" );
+            final String threadConfiguration = commandLine.hasOption( CLIManager.THREADS )
+                ? commandLine.getOptionValue( CLIManager.THREADS )
+                : null;
 
-            if ( threadConfiguration.contains( "C" ) )
+            if ( threadConfiguration != null )
             {
-                request.setDegreeOfConcurrency( calculateDegreeOfConcurrencyWithCoreMultiplier( threadConfiguration ) );
+                //
+                // Default to the standard multithreaded builder
+                //
+                request.setBuilderId( "multithreaded" );
+
+                if ( threadConfiguration.contains( "C" ) )
+                {
+                    request.setDegreeOfConcurrency( calculateDegreeOfConcurrencyWithCoreMultiplier( threadConfiguration ) );
+                }
+                else
+                {
+                    request.setDegreeOfConcurrency( Integer.valueOf( threadConfiguration ) );
+                }
             }
-            else
+
+            //
+            // Allow the builder to be overridden by the user if requested. The builders are now pluggable.
+            //
+            if ( commandLine.hasOption( CLIManager.BUILDER ) )
             {
-                request.setDegreeOfConcurrency( Integer.valueOf( threadConfiguration ) );
+                request.setBuilderId( commandLine.getOptionValue( CLIManager.BUILDER ) );
             }
         }
 
-        //
-        // Allow the builder to be overridden by the user if requested. The builders are now pluggable.
-        //
-        if ( commandLine.hasOption( CLIManager.BUILDER ) )
+        private void repository( CliRequest cliRequest )
+            throws Exception
         {
-            request.setBuilderId( commandLine.getOptionValue( CLIManager.BUILDER ) );
+            if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY ) || Boolean.getBoolean(
+                "maven.legacyLocalRepo" ) )
+            {
+                cliRequest.request.setUseLegacyLocalRepository( true );
+            }
         }
-    }
-
-    int calculateDegreeOfConcurrencyWithCoreMultiplier( String threadConfiguration )
-    {
-        int procs = Runtime.getRuntime().availableProcessors();
-        return (int) ( Float.valueOf( threadConfiguration.replace( "C", "" ) ) * procs );
-    }
 
-    static File resolveFile(File file, String workingDirectory )
-    {
-        if ( file == null )
+        private int execute(CliRequest cliRequest)
+            throws MavenExecutionRequestPopulationException
         {
-            return null;
+            commands(cliRequest);
+
+            MavenExecutionRequest request = executionRequestPopulator.populateDefaults( cliRequest.request );
+
+            eventSpyDispatcher.onEvent( request );
+
+            MavenExecutionResult result = maven.execute( request );
+
+            eventSpyDispatcher.onEvent( result );
+
+            if ( result.hasExceptions() )
+            {
+                ExceptionHandler handler = new DefaultExceptionHandler();
+
+                Map<String, String> references = new LinkedHashMap<>();
+
+                MavenProject project = null;
+
+                for ( Throwable exception : result.getExceptions() )
+                {
+                    ExceptionSummary summary = handler.handleException( exception );
+
+                    logSummary( summary, references, "", cliRequest.showErrors );
+
+                    if ( project == null && exception instanceof LifecycleExecutionException )
+                    {
+                        project = ( (LifecycleExecutionException) exception ).getProject();
+                    }
+                }
+
+                slf4jLogger.error( "" );
+
+                if ( !cliRequest.showErrors )
+                {
+                    slf4jLogger.error( "To see the full stack trace of the errors, re-run Maven with the {} switch.",
+                            buffer().strong( "-e" ) );
+                }
+                if ( !slf4jLogger.isDebugEnabled() )
+                {
+                    slf4jLogger.error( "Re-run Maven using the {} switch to enable full debug logging.",
+                            buffer().strong( "-X" ) );
+                }
+
+                if ( !references.isEmpty() )
+                {
+                    slf4jLogger.error( "" );
+                    slf4jLogger.error( "For more information about the errors and possible solutions"
+                                           + ", please read the following articles:" );
+
+                    for ( Entry<String, String> entry : references.entrySet() )
+                    {
+                        slf4jLogger.error( "{} {}", buffer().strong( entry.getValue() ), entry.getKey() );
+                    }
+                }
+
+                if ( project != null && !project.equals( result.getTopologicallySortedProjects().get( 0 ) ) )
+                {
+                    slf4jLogger.error( "" );
+                    slf4jLogger.error( "After correcting the problems, you can resume the build with the command" );
+                    slf4jLogger.error( buffer().a( "  " ).strong( "mvn <args> -rf "
+                        + getResumeFrom( result.getTopologicallySortedProjects(), project ) ).toString() );
+                }
+
+                if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( cliRequest.request.getReactorFailureBehavior() ) )
+                {
+                    slf4jLogger.info( "Build failures were ignored." );
+
+                    return 0;
+                }
+                else
+                {
+                    return 1;
+                }
+            }
+            else
+            {
+                return 0;
+            }
         }
-        else if ( file.isAbsolute() )
+        private static Object getLocation(Source source, File defaultLocation )
         {
-            return file;
+            if ( source != null )
+            {
+                return source.getLocation();
+            }
+            return defaultLocation;
         }
-        else if ( file.getPath().startsWith( File.separator ) )
+
+        protected TransferListener getConsoleTransferListener( boolean printResourceNames )
         {
-            // drive-relative Windows path
-            return file.getAbsoluteFile();
+            return new ConsoleMavenTransferListener( System.out, printResourceNames );
         }
-        else
+
+        protected TransferListener getBatchTransferListener()
         {
-            return new File( workingDirectory, file.getPath() ).getAbsoluteFile();
+            return new Slf4jMavenTransferListener();
         }
-    }
-
-    // ----------------------------------------------------------------------
-    // System properties handling
-    // ----------------------------------------------------------------------
 
-    static void populateProperties(CommandLine commandLine, Properties systemProperties, Properties userProperties )
-    {
-        EnvironmentUtils.addEnvVars( systemProperties );
-
-        // ----------------------------------------------------------------------
-        // Options that are set on the command line become system properties
-        // and therefore are set in the session properties. System properties
-        // are most dominant.
-        // ----------------------------------------------------------------------
+        static int calculateDegreeOfConcurrencyWithCoreMultiplier( String threadConfiguration )
+        {
+            int procs = Runtime.getRuntime().availableProcessors();
+            return (int) ( Float.valueOf( threadConfiguration.replace( "C", "" ) ) * procs );
+        }
 
-        if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) )
+        private void logSummary(ExceptionSummary summary, Map<String, String> references, String indent,
+                                boolean showErrors )
         {
-            String[] defStrs = commandLine.getOptionValues( CLIManager.SET_SYSTEM_PROPERTY );
+            String referenceKey = "";
 
-            if ( defStrs != null )
+            if ( StringUtils.isNotEmpty( summary.getReference() ) )
             {
-                for ( String defStr : defStrs )
+                referenceKey = references.get( summary.getReference() );
+                if ( referenceKey == null )
                 {
-                    setCliProperty( defStr, userProperties );
+                    referenceKey = "[Help " + ( references.size() + 1 ) + "]";
+                    references.put( summary.getReference(), referenceKey );
                 }
             }
-        }
 
-        SystemProperties.addSystemProperties( systemProperties );
+            String msg = summary.getMessage();
 
-        // ----------------------------------------------------------------------
-        // Properties containing info about the currently running version of Maven
-        // These override any corresponding properties set on the command line
-        // ----------------------------------------------------------------------
+            if ( StringUtils.isNotEmpty( referenceKey ) )
+            {
+                if ( msg.indexOf( '\n' ) < 0 )
+                {
+                    msg += " -> " + buffer().strong( referenceKey );
+                }
+                else
+                {
+                    msg += "\n-> " + buffer().strong( referenceKey );
+                }
+            }
 
-        Properties buildProperties = CLIReportingUtils.getBuildProperties();
+            String[] lines = msg.split( "(\r\n)|(\r)|(\n)" );
+            String currentColor = "";
 
-        String mavenVersion = buildProperties.getProperty( CLIReportingUtils.BUILD_VERSION_PROPERTY );
-        systemProperties.setProperty( "maven.version", mavenVersion );
+            for ( int i = 0; i < lines.length; i++ )
+            {
+                // add eventual current color inherited from previous line
+                String line = currentColor + lines[i];
 
-        String mavenBuildVersion = CLIReportingUtils.createMavenVersionString( buildProperties );
-        systemProperties.setProperty( "maven.build.version", mavenBuildVersion );
-    }
+                // look for last ANSI escape sequence to check if nextColor
+                Matcher matcher = LAST_ANSI_SEQUENCE.matcher( line );
+                String nextColor = "";
+                if ( matcher.find() )
+                {
+                    nextColor = matcher.group( 1 );
+                    if ( ANSI_RESET.equals( nextColor ) )
+                    {
+                        // last ANSI escape code is reset: no next color
+                        nextColor = "";
+                    }
+                }
 
-    private static void setCliProperty(String property, Properties properties )
-    {
-        String name;
+                // effective line, with indent and reset if end is colored
+                line = indent + line + ( "".equals( nextColor ) ? "" : ANSI_RESET );
 
-        String value;
+                if ( ( i == lines.length - 1 ) && ( showErrors
+                    || ( summary.getException() instanceof InternalErrorException ) ) )
+                {
+                    slf4jLogger.error( line, summary.getException() );
+                }
+                else
+                {
+                    slf4jLogger.error( line );
+                }
 
-        int i = property.indexOf( '=' );
+                currentColor = nextColor;
+            }
 
-        if ( i <= 0 )
-        {
-            name = property.trim();
+            indent += "  ";
 
-            value = "true";
+            for ( ExceptionSummary child : summary.getChildren() )
+            {
+                logSummary( child, references, indent, showErrors );
+            }
         }
-        else
-        {
-            name = property.substring( 0, i ).trim();
 
-            value = property.substring( i + 1 );
+        /**
+         * A helper method to determine the value to resume the build with {@code -rf} taking into account the
+         * edge case where multiple modules in the reactor have the same artifactId.
+         * <p>
+         * {@code -rf :artifactId} will pick up the first module which matches, but when multiple modules in the
+         * reactor have the same artifactId, effective failed module might be later in build reactor.
+         * This means that developer will either have to type groupId or wait for build execution of all modules
+         * which were fine, but they are still before one which reported errors.
+         * <p>Then the returned value is {@code groupId:artifactId} when there is a name clash and
+         * {@code :artifactId} if there is no conflict.
+         *
+         * @param mavenProjects Maven projects which are part of build execution.
+         * @param failedProject Project which has failed.
+         * @return Value for -rf flag to resume build exactly from place where it failed ({@code :artifactId} in
+         *    general and {@code groupId:artifactId} when there is a name clash).
+         */
+        private String getResumeFrom(List<MavenProject> mavenProjects, MavenProject failedProject )
+        {
+            for ( MavenProject buildProject : mavenProjects )
+            {
+                if ( failedProject.getArtifactId().equals( buildProject.getArtifactId() ) && !failedProject.equals(
+                        buildProject ) )
+                {
+                    return failedProject.getGroupId() + ":" + failedProject.getArtifactId();
+                }
+            }
+            return ":" + failedProject.getArtifactId();
         }
 
-        properties.setProperty( name, value );
+        static File resolveFile(File file, String workingDirectory )
+        {
+            if ( file == null )
+            {
+                return null;
+            }
+            else if ( file.isAbsolute() )
+            {
+                return file;
+            }
+            else if ( file.getPath().startsWith( File.separator ) )
+            {
+                // drive-relative Windows path
+                return file.getAbsoluteFile();
+            }
+            else
+            {
+                return new File( workingDirectory, file.getPath() ).getAbsoluteFile();
+            }
+        }
 
         // ----------------------------------------------------------------------
-        // I'm leaving the setting of system properties here as not to break
-        // the SystemPropertyProfileActivator. This won't harm embedding. jvz.
+        // System properties handling
         // ----------------------------------------------------------------------
-
-        System.setProperty( name, value );
-    }
-
-    static class ExitException
-        extends Exception
-    {
-        static final long serialVersionUID = 1L;
-        int exitCode;
-
-        ExitException( int exitCode )
-        {
-            this.exitCode = exitCode;
+        
+        static void populateProperties(CommandLine commandLine, Properties systemProperties, Properties userProperties )
+        {
+            EnvironmentUtils.addEnvVars( systemProperties );
+        
+            // ----------------------------------------------------------------------
+            // Options that are set on the command line become system properties
+            // and therefore are set in the session properties. System properties
+            // are most dominant.
+            // ----------------------------------------------------------------------
+        
+            if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) )
+            {
+                String[] defStrs = commandLine.getOptionValues( CLIManager.SET_SYSTEM_PROPERTY );
+        
+                if ( defStrs != null )
+                {
+                    for ( String defStr : defStrs )
+                    {
+                        setCliProperty( defStr, userProperties );
+                    }
+                }
+            }
+        
+            SystemProperties.addSystemProperties( systemProperties );
+        
+            // ----------------------------------------------------------------------
+            // Properties containing info about the currently running version of Maven
+            // These override any corresponding properties set on the command line
+            // ----------------------------------------------------------------------
+        
+            Properties buildProperties = CLIReportingUtils.getBuildProperties();
+        
+            String mavenVersion = buildProperties.getProperty( CLIReportingUtils.BUILD_VERSION_PROPERTY );
+            systemProperties.setProperty( "maven.version", mavenVersion );
+        
+            String mavenBuildVersion = CLIReportingUtils.createMavenVersionString( buildProperties );
+            systemProperties.setProperty( "maven.build.version", mavenBuildVersion );
+        }
+
+        private static void setCliProperty(String property, Properties properties )
+        {
+            String name;
+        
+            String value;
+        
+            int i = property.indexOf( '=' );
+        
+            if ( i <= 0 )
+            {
+                name = property.trim();
+        
+                value = "true";
+            }
+            else
+            {
+                name = property.substring( 0, i ).trim();
+        
+                value = property.substring( i + 1 );
+            }
+        
+            properties.setProperty( name, value );
+        
+            // ----------------------------------------------------------------------
+            // I'm leaving the setting of system properties here as not to break
+            // the SystemPropertyProfileActivator. This won't harm embedding. jvz.
+            // ----------------------------------------------------------------------
+        
+            System.setProperty( name, value );
         }
-    }
 
-    //
-    // Customizations available via the CLI
-    //
-
-    protected TransferListener getConsoleTransferListener( boolean printResourceNames )
-    {
-        return new ConsoleMavenTransferListener( System.out, printResourceNames );
-    }
-
-    protected TransferListener getBatchTransferListener()
-    {
-        return new Slf4jMavenTransferListener();
-    }
-
-    protected ModelProcessor createModelProcessor( PlexusContainer container )
-        throws ComponentLookupException
-    {
-        return container.lookup( ModelProcessor.class );
     }
 }