Repository: maven Updated Branches: refs/heads/master 1a4c003a2 -> d8fd65a3a
MNG-2570: logging configuration now no longer overwrites the default log level as specified in conf/logging/simplelogger.properties Submitted by: Andreas Horst <[email protected]> Signed-off-by: Jason van Zyl <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d8fd65a3 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d8fd65a3 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d8fd65a3 Branch: refs/heads/master Commit: d8fd65a3aefedfb69c4a70c5710bb163940a3d0a Parents: 1a4c003 Author: a-horst <[email protected]> Authored: Mon Jun 16 17:00:12 2014 +0200 Committer: Jason van Zyl <[email protected]> Committed: Sun Jul 6 13:09:41 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/maven/cli/MavenCli.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/d8fd65a3/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 f670284..123b01a 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 @@ -318,11 +318,8 @@ public class MavenCli cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_ERROR ); slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.ERROR ); } - else - { - cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_INFO ); - slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.INFO ); - } + // else fall back to default log level specified in conf + // see http://jira.codehaus.org/browse/MNG-2570 if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) ) {
