Repository: maven Updated Branches: refs/heads/MNG-3507 2d2c8544c -> f31129164
MNG-3507 init AnsiConsole to not interfere with ITs run as embedded Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f3112916 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f3112916 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f3112916 Branch: refs/heads/MNG-3507 Commit: f31129164035e3204a0d86fca2b7baf7092ca83e Parents: 2d2c854 Author: Hervé Boutemy <hbout...@apache.org> Authored: Fri Jun 10 08:37:33 2016 +0200 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Fri Jun 10 08:37:33 2016 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/maven/cli/MavenCli.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/f3112916/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 5c9d2b1..32c3292 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -209,7 +209,12 @@ public class MavenCli public static int main( String[] args, ClassWorld classWorld ) { MavenCli cli = new MavenCli(); - return cli.doMain( new CliRequest( args, classWorld ) ); + + AnsiConsole.systemInstall(); + int result = cli.doMain( new CliRequest( args, classWorld ) ); + AnsiConsole.systemUninstall(); + + return result; } // TODO: need to externalize CliRequest @@ -219,7 +224,11 @@ public class MavenCli return cli.doMain( new CliRequest( args, classWorld ) ); } - // This supports painless invocation by the Verifier during embedded execution of the core ITs + /** + * This supports painless invocation by the Verifier during embedded execution of the core ITs. + * See <a href="http://maven.apache.org/shared/maven-verifier/xref/org/apache/maven/it/Embedded3xLauncher.html";> + * <code>Embedded3xLauncher</code> in <code>maven-verifier</code></a> + */ public int doMain( String[] args, String workingDirectory, PrintStream stdout, PrintStream stderr ) { PrintStream oldout = System.out; @@ -286,7 +295,6 @@ public class MavenCli PlexusContainer localContainer = null; try { - AnsiConsole.systemInstall(); initialize( cliRequest ); cli( cliRequest ); logging( cliRequest ); @@ -329,7 +337,6 @@ public class MavenCli { localContainer.dispose(); } - AnsiConsole.systemUninstall(); } }
