Updated Branches: refs/heads/logging/slf4j-log4j2 fa35ca7de -> 9350d1a6d
make it pass Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9350d1a6 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9350d1a6 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9350d1a6 Branch: refs/heads/logging/slf4j-log4j2 Commit: 9350d1a6d91f96e542509ad97ec751642a1c23b8 Parents: 626b34b Author: olivier lamy <ol...@apache.org> Authored: Mon Dec 17 17:32:04 2012 +0100 Committer: olivier lamy <ol...@apache.org> Committed: Mon Dec 17 17:32:04 2012 +0100 ---------------------------------------------------------------------- apache-maven/src/conf/logging/log4j2-color.xml | 2 +- .../main/java/org/apache/maven/cli/MavenCli.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/9350d1a6/apache-maven/src/conf/logging/log4j2-color.xml ---------------------------------------------------------------------- diff --git a/apache-maven/src/conf/logging/log4j2-color.xml b/apache-maven/src/conf/logging/log4j2-color.xml index ec93c35..0fab951 100644 --- a/apache-maven/src/conf/logging/log4j2-color.xml +++ b/apache-maven/src/conf/logging/log4j2-color.xml @@ -25,7 +25,7 @@ </properties> <appenders> <Console name="console" target="SYSTEM_OUT"> - <PatternLayout pattern="%highlight{[%p] %msg%n%throwable}{INFO=white}" /> + <PatternLayout pattern="%highlight{[%p{WARN=WARNING}] %msg%n%throwable}{INFO=white}" /> </Console> </appenders> <loggers> http://git-wip-us.apache.org/repos/asf/maven/blob/9350d1a6/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 f4215cf..d457260 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 @@ -324,7 +324,7 @@ public class MavenCli { File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) ); logFile = resolveFile( logFile, cliRequest.workingDirectory ); - System.setProperty("log4j.configurationFile", logFile.getAbsolutePath() ); + try { PrintStream ps = new PrintStream( new FileOutputStream( logFile ) );