Author: brett
Date: Tue Aug 8 19:51:09 2006
New Revision: 429932
URL: http://svn.apache.org/viewvc?rev=429932&view=rev
Log:
fix the logging issues - bad merge
Modified:
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
Modified:
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java?rev=429932&r1=429931&r2=429932&view=diff
==============================================================================
---
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
Tue Aug 8 19:51:09 2006
@@ -77,6 +77,7 @@
}
boolean debug = commandLine.hasOption( CLIManager.DEBUG );
+ boolean quiet = !debug && commandLine.hasOption( CLIManager.QUIET );
boolean showErrors = debug || commandLine.hasOption( CLIManager.ERRORS
);
@@ -170,13 +171,6 @@
{
recursive = false;
}
- else if ( commandLine.hasOption( CLIManager.QUIET ) )
- {
- // TODO: we need to do some more work here. Some plugins use
sys out or log errors at info level.
- // Ideally, we could use Warn across the board
- loggerManager.setThreshold( Logger.LEVEL_ERROR );
- // TODO:Additionally, we can't change the mojo level because
the component key includes the version and it isn't known ahead of time. This
seems worth changing.
- }
if ( commandLine.hasOption( CLIManager.FAIL_FAST ) )
{
@@ -330,9 +324,16 @@
{
loggingLevel = MavenExecutionRequest.LOGGING_LEVEL_DEBUG;
}
+ else if ( quiet )
+ {
+ // TODO: we need to do some more work here. Some plugins use
sys out or log errors at info level.
+ // Ideally, we could use Warn across the board
+ loggingLevel = MavenExecutionRequest.LOGGING_LEVEL_ERROR;
+ // TODO:Additionally, we can't change the mojo level because
the component key includes the version and it isn't known ahead of time. This
seems worth changing.
+ }
else
{
- loggingLevel = MavenExecutionRequest.LOGGING_LEVEL_WARN;
+ loggingLevel = MavenExecutionRequest.LOGGING_LEVEL_INFO;
}
Properties executionProperties = getExecutionProperties(
commandLine );