Author: jvanzyl
Date: Wed Oct 10 22:48:08 2012
New Revision: 1396842
URL: http://svn.apache.org/viewvc?rev=1396842&view=rev
Log:
o Use SLF4J for logging
Conflicts:
pom.xml
Added:
maven/maven-3/trunk/apache-maven/src/conf/logging/
maven/maven-3/trunk/apache-maven/src/conf/logging/simplelogger.properties
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
- copied, changed from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/DefaultEventSpyContext.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
- copied, changed from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/PrintStreamLogger.java
- copied, changed from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
- copied, changed from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractMavenTransferListener.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
- copied, changed from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/BatchModeMavenTransferListener.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
- copied, changed from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ConsoleMavenTransferListener.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java
- copied, changed from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/QuietMavenTransferListener.java
Removed:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractMavenTransferListener.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/BatchModeMavenTransferListener.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ConsoleMavenTransferListener.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/DefaultEventSpyContext.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PlexusLogger.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PlexusLoggerFactory.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/QuietMavenTransferListener.java
Modified:
maven/maven-3/trunk/apache-maven/pom.xml
maven/maven-3/trunk/apache-maven/src/bin/m2.conf
maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/pom.xml?rev=1396842&r1=1396841&r2=1396842&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/pom.xml (original)
+++ maven/maven-3/trunk/apache-maven/pom.xml Wed Oct 10 22:48:08 2012
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
+ <artifactId>slf4j-simple</artifactId>
</dependency>
</dependencies>
Modified: maven/maven-3/trunk/apache-maven/src/bin/m2.conf
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/m2.conf?rev=1396842&r1=1396841&r2=1396842&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/m2.conf (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/m2.conf Wed Oct 10 22:48:08 2012
@@ -5,3 +5,4 @@ set maven.home default ${user.home}/m2
[plexus.core]
optionally ${maven.home}/lib/ext/*.jar
load ${maven.home}/lib/*.jar
+load ${maven.home}/conf/logging
Added: maven/maven-3/trunk/apache-maven/src/conf/logging/simplelogger.properties
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/conf/logging/simplelogger.properties?rev=1396842&view=auto
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/conf/logging/simplelogger.properties
(added)
+++ maven/maven-3/trunk/apache-maven/src/conf/logging/simplelogger.properties
Wed Oct 10 22:48:08 2012
@@ -0,0 +1,3 @@
+org.slf4j.simpleLogger.defaultLogLevel = info
+org.slf4j.simpleLogger.showDateTime=false
org.slf4j.simpleLogger.showThreadName=false
org.slf4j.simpleLogger.showLogName=false
org.slf4j.simpleLogger.logFile=System.out
+org.slf4j.simpleLogger.levelInBrackets=true
Modified: maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml?rev=1396842&r1=1396841&r2=1396842&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml (original)
+++ maven/maven-3/trunk/apache-maven/src/main/assembly/bin.xml Wed Oct 10
22:48:08 2012
@@ -37,30 +37,7 @@ under the License.
<excludes>
<exclude>org.codehaus.plexus:plexus-classworlds</exclude>
<exclude>junit:junit</exclude>
- <exclude>log4j:log4j</exclude>
<exclude>commons-logging:commons-logging-api</exclude>
-
- <!--exclude>org.codehaus.plexus:plexus-classworlds</exclude>
- <exclude>org.codehaus.plexus:plexus-component-api</exclude>
- <exclude>classworlds:classworlds</exclude>
- <exclude>junit:junit</exclude>
- <exclude>jmock:jmock</exclude>
- <exclude>xml-apis:xml-apis</exclude>
- <exclude>org.apache.maven:apache-maven</exclude>
- <exclude>org.apache.maven:maven-artifact</exclude>
- <exclude>org.apache.maven:maven-monitor</exclude>
- <exclude>org.apache.maven:maven-plugin-descriptor</exclude>
- <exclude>jdom:jdom</exclude>
- <exclude>org.apache.maven:apache-maven</exclude>
- <exclude>bouncycastle:bcprov-jdk15</exclude>
- <exclude>bouncycastle:bcpg-jdk15</exclude>
- <exclude>log4j:log4j</exclude>
- <exclude>org.sonatype.mercury:mercury-mp3-cli</exclude>
- <exclude>commons-logging:commons-logging-api</exclude>
- <exclude>org.slf4j:slf4j-api</exclude>
- <exclude>org.slf4j:slf4j-jdk14</exclude>
- <exclude>org.apache.maven.mercury:mercury-crypto-api</exclude>
- <exclude>org.apache.maven.mercury:mercury-crypto-basic</exclude-->
</excludes>
</dependencySet>
</dependencySets>
Modified:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java?rev=1396842&r1=1396841&r2=1396842&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
Wed Oct 10 22:48:08 2012
@@ -21,17 +21,16 @@ package org.apache.maven.cli;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.io.PrintStream;
-import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.Properties;
-import java.util.TimeZone;
-import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.Os;
+import org.slf4j.Logger;
/**
* Utility class used to report errors, statistics, application version info,
etc.
@@ -50,24 +49,18 @@ public final class CLIReportingUtils
public static final String BUILD_VERSION_PROPERTY = "version";
- public static void showVersion( PrintStream stdout )
+ public static String showVersion()
{
+ String LS = System.getProperty("line.separator");
Properties properties = getBuildProperties();
- stdout.println( createMavenVersionString( properties ) );
- String shortName = reduce( properties.getProperty(
"distributionShortName" ) );
-
- stdout.println( shortName + " home: " + System.getProperty(
"maven.home", "<unknown maven home>" ) );
-
- stdout.println( "Java version: " + System.getProperty( "java.version",
"<unknown java version>" )
- + ", vendor: " + System.getProperty( "java.vendor", "<unknown
vendor>" ) );
-
- stdout.println( "Java home: " + System.getProperty( "java.home",
"<unknown java home>" ) );
-
- stdout.println( "Default locale: " + Locale.getDefault() + ", platform
encoding: "
- + System.getProperty( "file.encoding", "<unknown encoding>" ) );
-
- stdout.println( "OS name: \"" + Os.OS_NAME + "\", version: \"" +
Os.OS_VERSION + "\", arch: \"" + Os.OS_ARCH
- + "\", family: \"" + Os.OS_FAMILY + "\"" );
+ StringBuffer version = new StringBuffer();
+ version.append( createMavenVersionString( properties ) ).append( LS );
+ version.append( reduce( properties.getProperty(
"distributionShortName" ) + " home: " + System.getProperty( "maven.home",
"<unknown maven home>" ) ) ).append( LS );
+ version.append( "Java version: " + System.getProperty( "java.version",
"<unknown java version>" ) + ", vendor: " + System.getProperty( "java.vendor",
"<unknown vendor>" ) ).append( LS );
+ version.append( "Java home: " + System.getProperty( "java.home",
"<unknown java home>" ) ).append( LS );
+ version.append( "Default locale: " + Locale.getDefault() + ", platform
encoding: " + System.getProperty( "file.encoding", "<unknown encoding>" )
).append( LS );
+ version.append( "OS name: \"" + Os.OS_NAME + "\", version: \"" +
Os.OS_VERSION + "\", arch: \"" + Os.OS_ARCH + "\", family: \"" + Os.OS_FAMILY +
"\"" );
+ return version.toString();
}
/**
@@ -105,75 +98,6 @@ public final class CLIReportingUtils
return ( s != null ? ( s.startsWith( "${" ) && s.endsWith( "}" ) ?
null : s ) : null );
}
-
- private static void stats( Date start, Logger logger )
- {
- Date finish = new Date();
-
- long time = finish.getTime() - start.getTime();
-
- logger.info( "Total time: " + formatTime( time ) );
-
- logger.info( "Finished at: " + finish );
-
- //noinspection CallToSystemGC
- System.gc();
-
- Runtime r = Runtime.getRuntime();
-
- logger.info( "Final Memory: " + ( r.totalMemory() - r.freeMemory() ) /
MB + "M/" + r.totalMemory() / MB + "M" );
- }
-
- private static String formatTime( long ms )
- {
- long secs = ms / MS_PER_SEC;
-
- long min = secs / SEC_PER_MIN;
-
- secs = secs % SEC_PER_MIN;
-
- String msg = "";
-
- if ( min > 1 )
- {
- msg = min + " minutes ";
- }
- else if ( min == 1 )
- {
- msg = "1 minute ";
- }
-
- if ( secs > 1 )
- {
- msg += secs + " seconds";
- }
- else if ( secs == 1 )
- {
- msg += "1 second";
- }
- else if ( min == 0 )
- {
- msg += "< 1 second";
- }
- return msg;
- }
-
- private static String getFormattedTime( long time )
- {
- String pattern = "s.SSS's'";
- if ( time / 60000L > 0 )
- {
- pattern = "m:s" + pattern;
- if ( time / 3600000L > 0 )
- {
- pattern = "H:m" + pattern;
- }
- }
- DateFormat fmt = new SimpleDateFormat( pattern );
- fmt.setTimeZone( TimeZone.getTimeZone( "UTC" ) );
- return fmt.format( new Date( time ) );
- }
-
static Properties getBuildProperties()
{
Properties properties = new Properties();
@@ -201,11 +125,6 @@ public final class CLIReportingUtils
public static void showError( Logger logger, String message, Throwable e,
boolean showStackTrace )
{
- if ( logger == null )
- {
- logger = new PrintStreamLogger( System.out );
- }
-
if ( showStackTrace )
{
logger.error( message, e );
Modified:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=1396842&r1=1396841&r2=1396842&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Wed Oct 10 22:48:08 2012
@@ -36,6 +36,13 @@ import org.apache.commons.cli.Unrecogniz
import org.apache.maven.BuildAbort;
import org.apache.maven.InternalErrorException;
import org.apache.maven.Maven;
+import org.apache.maven.cli.event.DefaultEventSpyContext;
+import org.apache.maven.cli.event.ExecutionEventLogger;
+import org.apache.maven.cli.logging.PrintStreamLogger;
+import org.apache.maven.cli.logging.Slf4jLoggerManager;
+import org.apache.maven.cli.transfer.BatchModeMavenTransferListener;
+import org.apache.maven.cli.transfer.ConsoleMavenTransferListener;
+import org.apache.maven.cli.transfer.QuietMavenTransferListener;
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
import org.apache.maven.exception.DefaultExceptionHandler;
import org.apache.maven.exception.ExceptionHandler;
@@ -64,9 +71,11 @@ import org.codehaus.plexus.PlexusContain
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.StringUtils;
import org.slf4j.ILoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonatype.aether.transfer.TransferListener;
import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
@@ -105,9 +114,13 @@ public class MavenCli
// Per-instance container supports fast embedded execution of core ITs
private DefaultPlexusContainer container;
+
+ private LoggerManager plexusLoggerManager;
- private Logger logger;
-
+ private ILoggerFactory slf4jLoggerFactory;
+
+ private Logger slf4jLogger;
+
private EventSpyDispatcher eventSpyDispatcher;
private ModelProcessor modelProcessor;
@@ -188,7 +201,6 @@ public class MavenCli
try
{
initialize( cliRequest );
- // Need to process cli options first to get possible logging
options
cli( cliRequest );
logging( cliRequest );
version( cliRequest );
@@ -211,13 +223,13 @@ public class MavenCli
}
catch ( BuildAbort e )
{
- CLIReportingUtils.showError( logger, "ABORTED", e,
cliRequest.showErrors );
+ CLIReportingUtils.showError( slf4jLogger, "ABORTED", e,
cliRequest.showErrors );
return 2;
}
catch ( Exception e )
{
- CLIReportingUtils.showError( logger, "Error executing Maven.", e,
cliRequest.showErrors );
+ CLIReportingUtils.showError( slf4jLogger, "Error executing
Maven.", e, cliRequest.showErrors );
return 1;
}
@@ -227,10 +239,6 @@ public class MavenCli
{
localContainer.dispose();
}
- if ( cliRequest.fileStream != null )
- {
- cliRequest.fileStream.close();
- }
}
}
@@ -253,8 +261,37 @@ public class MavenCli
}
}
+ private void cli( CliRequest cliRequest )
+ throws Exception
+ {
+ CLIManager cliManager = new CLIManager();
+
+ try
+ {
+ cliRequest.commandLine = cliManager.parse( cliRequest.args );
+ }
+ 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 );
+ }
+
+ if ( cliRequest.commandLine.hasOption( CLIManager.VERSION ) )
+ {
+ System.out.println(CLIReportingUtils.showVersion());
+ throw new ExitException( 0 );
+ }
+ }
+
//
- // Logging needs to be handled in a standard way at the container level.
+ // All logging is handled by SFL4J
//
private void logging( CliRequest cliRequest )
{
@@ -265,78 +302,36 @@ public class MavenCli
if ( cliRequest.debug )
{
cliRequest.request.setLoggingLevel(
MavenExecutionRequest.LOGGING_LEVEL_DEBUG );
+ System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel",
"debug" );
}
else if ( cliRequest.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
cliRequest.request.setLoggingLevel(
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.
+ System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel",
"error" );
}
else
{
cliRequest.request.setLoggingLevel(
MavenExecutionRequest.LOGGING_LEVEL_INFO );
+ System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel",
"info" );
}
if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
{
File logFile = new File( cliRequest.commandLine.getOptionValue(
CLIManager.LOG_FILE ) );
logFile = resolveFile( logFile, cliRequest.workingDirectory );
-
- try
- {
- cliRequest.fileStream = new PrintStream( logFile );
-
- System.setOut( cliRequest.fileStream );
- System.setErr( cliRequest.fileStream );
- }
- catch ( FileNotFoundException e )
- {
- System.err.println( e );
- }
- }
- }
-
- //
- // Every bit of information taken from the CLI should be processed here.
- //
- private void cli( CliRequest cliRequest )
- throws Exception
- {
- CLIManager cliManager = new CLIManager();
-
- try
- {
- cliRequest.commandLine = cliManager.parse( cliRequest.args );
- }
- catch ( ParseException e )
- {
- System.err.println( "Unable to parse command line options: " +
e.getMessage() );
- cliManager.displayHelp( System.out );
- throw e;
- }
-
- // TODO: these should be moved out of here. Wrong place.
- //
- if ( cliRequest.commandLine.hasOption( CLIManager.HELP ) )
- {
- cliManager.displayHelp( System.out );
- throw new ExitException( 0 );
+ System.setProperty("org.slf4j.simpleLogger.logFile",
logFile.getAbsolutePath());
}
- if ( cliRequest.commandLine.hasOption( CLIManager.VERSION ) )
- {
- CLIReportingUtils.showVersion( System.out );
- throw new ExitException( 0 );
- }
+ plexusLoggerManager = new Slf4jLoggerManager();
+ slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
+ slf4jLogger = slf4jLoggerFactory.getLogger(this.getClass().getName());
}
private void version( CliRequest cliRequest )
{
if ( cliRequest.debug || cliRequest.commandLine.hasOption(
CLIManager.SHOW_VERSION ) )
{
- CLIReportingUtils.showVersion( System.out );
+ System.out.print(CLIReportingUtils.showVersion());
}
}
@@ -344,16 +339,16 @@ public class MavenCli
{
if ( cliRequest.showErrors )
{
- logger.info( "Error stacktraces are turned on." );
+ slf4jLogger.info( "Error stacktraces are turned on." );
}
if ( MavenExecutionRequest.CHECKSUM_POLICY_WARN.equals(
cliRequest.request.getGlobalChecksumPolicy() ) )
{
- logger.info( "Disabling strict checksum verification on all
artifact downloads." );
+ slf4jLogger.info( "Disabling strict checksum verification on all
artifact downloads." );
}
else if ( MavenExecutionRequest.CHECKSUM_POLICY_FAIL.equals(
cliRequest.request.getGlobalChecksumPolicy() ) )
{
- logger.info( "Enabling strict checksum verification on all
artifact downloads." );
+ slf4jLogger.info( "Enabling strict checksum verification on all
artifact downloads." );
}
}
@@ -374,10 +369,6 @@ public class MavenCli
if ( container == null )
{
- logger = setupLogger( cliRequest );
-
- final MavenLoggerManager loggerManager = new MavenLoggerManager(
logger ) ;
-
ContainerConfiguration cc = new DefaultContainerConfiguration()
.setClassWorld( cliRequest.classWorld )
.setRealm( setupContainerRealm( cliRequest ) )
@@ -390,7 +381,7 @@ public class MavenCli
protected void configure()
{
- bind( ILoggerFactory.class ).toInstance( new
PlexusLoggerFactory( loggerManager ) );
+ bind( ILoggerFactory.class ).toInstance(
slf4jLoggerFactory );
}
} );
@@ -398,7 +389,7 @@ public class MavenCli
// NOTE: To avoid inconsistencies, we'll use the TCCL exclusively
for lookups
container.setLookupRealm( null );
- container.setLoggerManager( loggerManager );
+ container.setLoggerManager( plexusLoggerManager );
customizeContainer( container );
@@ -424,7 +415,7 @@ public class MavenCli
eventSpyDispatcher.init( eventSpyContext );
// refresh logger in case container got customized by spy
- logger = container.getLoggerManager().getLoggerForComponent(
MavenCli.class.getName(), null );
+ slf4jLogger = slf4jLoggerFactory.getLogger(this.getClass().getName());
maven = container.lookup( Maven.class );
@@ -439,21 +430,6 @@ public class MavenCli
return container;
}
- private PrintStreamLogger setupLogger( CliRequest cliRequest )
- {
- PrintStreamLogger logger = new PrintStreamLogger( new
PrintStreamLogger.Provider()
- {
- public PrintStream getStream()
- {
- return System.out;
- }
- } );
-
- logger.setThreshold( cliRequest.request.getLoggingLevel() );
-
- return logger;
- }
-
private ClassRealm setupContainerRealm( CliRequest cliRequest )
throws Exception
{
@@ -479,13 +455,13 @@ public class MavenCli
ClassRealm extRealm = cliRequest.classWorld.newRealm(
"maven.ext", null );
- logger.debug( "Populating class realm " + extRealm.getId() );
+ slf4jLogger.debug( "Populating class realm " +
extRealm.getId() );
for ( String jar : jars )
{
File file = resolveFile( new File( jar ),
cliRequest.workingDirectory );
- logger.debug( " Included " + file );
+ slf4jLogger.debug( " Included " + file );
extRealm.addURL( file.toURI().toURL() );
}
@@ -499,10 +475,6 @@ public class MavenCli
return containerRealm;
}
- protected void customizeContainer( PlexusContainer container )
- {
- }
-
//
// This should probably be a separate tool and not be baked into Maven.
//
@@ -583,39 +555,39 @@ public class MavenCli
}
}
- logger.error( "" );
+ slf4jLogger.error( "" );
if ( !cliRequest.showErrors )
{
- logger.error( "To see the full stack trace of the errors,
re-run Maven with the -e switch." );
+ slf4jLogger.error( "To see the full stack trace of the errors,
re-run Maven with the -e switch." );
}
- if ( !logger.isDebugEnabled() )
+ if ( !slf4jLogger.isDebugEnabled() )
{
- logger.error( "Re-run Maven using the -X switch to enable full
debug logging." );
+ slf4jLogger.error( "Re-run Maven using the -X switch to enable
full debug logging." );
}
if ( !references.isEmpty() )
{
- logger.error( "" );
- logger.error( "For more information about the errors and
possible solutions"
+ slf4jLogger.error( "" );
+ slf4jLogger.error( "For more information about the errors and
possible solutions"
+ ", please read the following articles:" );
for ( Map.Entry<String, String> entry : references.entrySet() )
{
- logger.error( entry.getValue() + " " + entry.getKey() );
+ slf4jLogger.error( entry.getValue() + " " + entry.getKey()
);
}
}
if ( project != null && !project.equals(
result.getTopologicallySortedProjects().get( 0 ) ) )
{
- logger.error( "" );
- logger.error( "After correcting the problems, you can resume
the build with the command" );
- logger.error( " mvn <goals> -rf :" + project.getArtifactId()
);
+ slf4jLogger.error( "" );
+ slf4jLogger.error( "After correcting the problems, you can
resume the build with the command" );
+ slf4jLogger.error( " mvn <goals> -rf :" +
project.getArtifactId() );
}
if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals(
cliRequest.request.getReactorFailureBehavior() ) )
{
- logger.info( "Build failures were ignored." );
+ slf4jLogger.info( "Build failures were ignored." );
return 0;
}
@@ -667,11 +639,11 @@ public class MavenCli
if ( i == lines.length - 1 && ( showErrors || (
summary.getException() instanceof InternalErrorException ) ) )
{
- logger.error( line, summary.getException() );
+ slf4jLogger.error( line, summary.getException() );
}
else
{
- logger.error( line );
+ slf4jLogger.error( line );
}
}
@@ -683,12 +655,6 @@ public class MavenCli
}
}
- protected ModelProcessor createModelProcessor( PlexusContainer container )
- throws ComponentLookupException
- {
- return container.lookup( ModelProcessor.class );
- }
-
private void settings( CliRequest cliRequest )
throws Exception
{
@@ -740,9 +706,9 @@ public class MavenCli
eventSpyDispatcher.onEvent( settingsRequest );
- logger.debug( "Reading global settings from "
+ slf4jLogger.debug( "Reading global settings from "
+ getSettingsLocation( settingsRequest.getGlobalSettingsSource(),
settingsRequest.getGlobalSettingsFile() ) );
- logger.debug( "Reading user settings from "
+ slf4jLogger.debug( "Reading user settings from "
+ getSettingsLocation( settingsRequest.getUserSettingsSource(),
settingsRequest.getUserSettingsFile() ) );
SettingsBuildingResult settingsResult = settingsBuilder.build(
settingsRequest );
@@ -751,17 +717,17 @@ public class MavenCli
executionRequestPopulator.populateFromSettings( cliRequest.request,
settingsResult.getEffectiveSettings() );
- if ( !settingsResult.getProblems().isEmpty() && logger.isWarnEnabled()
)
+ if ( !settingsResult.getProblems().isEmpty() &&
slf4jLogger.isWarnEnabled() )
{
- logger.warn( "" );
- logger.warn( "Some problems were encountered while building the
effective settings" );
+ slf4jLogger.warn( "" );
+ slf4jLogger.warn( "Some problems were encountered while building
the effective settings" );
for ( SettingsProblem problem : settingsResult.getProblems() )
{
- logger.warn( problem.getMessage() + " @ " +
problem.getLocation() );
+ slf4jLogger.warn( problem.getMessage() + " @ " +
problem.getLocation() );
}
- logger.warn( "" );
+ slf4jLogger.warn( "" );
}
}
@@ -787,7 +753,7 @@ public class MavenCli
{
if ( commandLine.hasOption( deprecatedOption ) )
{
- logger.warn( "Command line option -" + deprecatedOption
+ slf4jLogger.warn( "Command line option -" + deprecatedOption
+ " is deprecated and will be removed in future Maven
versions." );
}
}
@@ -909,14 +875,14 @@ public class MavenCli
}
else if ( request.isInteractiveMode() )
{
- transferListener = new ConsoleMavenTransferListener( System.out );
+ transferListener = new ConsoleMavenTransferListener( slf4jLogger );
}
else
{
- transferListener = new BatchModeMavenTransferListener( System.out
);
+ transferListener = new BatchModeMavenTransferListener( slf4jLogger
);
}
- ExecutionListener executionListener = new ExecutionEventLogger( logger
);
+ ExecutionListener executionListener = new ExecutionEventLogger(
slf4jLogger );
executionListener = eventSpyDispatcher.chainListener(
executionListener );
String alternatePomFile = null;
@@ -1146,7 +1112,6 @@ public class MavenCli
boolean debug;
boolean quiet;
boolean showErrors = true;
- PrintStream fileStream;
Properties userProperties = new Properties();
Properties systemProperties = new Properties();
MavenExecutionRequest request;
@@ -1172,4 +1137,32 @@ public class MavenCli
}
+ private PrintStreamLogger setupLogger( int loggingLevel )
+ {
+ PrintStreamLogger logger = new PrintStreamLogger( new
PrintStreamLogger.Provider()
+ {
+ public PrintStream getStream()
+ {
+ return System.out;
+ }
+ } );
+
+ logger.setThreshold( loggingLevel );
+
+ return logger;
+ }
+
+ //
+ // Customizations available via the CLI
+ //
+
+ protected void customizeContainer( PlexusContainer container )
+ {
+ }
+
+ protected ModelProcessor createModelProcessor( PlexusContainer container )
+ throws ComponentLookupException
+ {
+ return container.lookup( ModelProcessor.class );
+ }
}
Copied:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
(from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/DefaultEventSpyContext.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java?p2=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java&p1=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/DefaultEventSpyContext.java&r1=1396668&r2=1396842&rev=1396842&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/DefaultEventSpyContext.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java
Wed Oct 10 22:48:08 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.cli;
+package org.apache.maven.cli.event;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
(from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java?p2=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java&p1=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java&r1=1396668&r2=1396842&rev=1396842&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
Wed Oct 10 22:48:08 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.cli;
+package org.apache.maven.cli.event;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,7 +30,7 @@ import org.apache.maven.execution.MavenE
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
/**
* Logs execution events to a user-supplied logger.
Copied:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/PrintStreamLogger.java
(from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/PrintStreamLogger.java?p2=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/PrintStreamLogger.java&p1=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java&r1=1396668&r2=1396842&rev=1396842&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/PrintStreamLogger.java
Wed Oct 10 22:48:08 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.cli;
+package org.apache.maven.cli.logging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,7 +34,7 @@ public class PrintStreamLogger
extends AbstractLogger
{
- interface Provider
+ public interface Provider
{
PrintStream getStream();
}
Added:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java?rev=1396842&view=auto
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
(added)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
Wed Oct 10 22:48:08 2012
@@ -0,0 +1,93 @@
+package org.apache.maven.cli.logging;
+
+import org.codehaus.plexus.logging.Logger;
+
+/**
+ * Adapt an SLF4J logger to a Plexus logger.
+ *
+ * @author Jason van Zyl
+ */
+public class Slf4jLogger implements Logger {
+
+ private org.slf4j.Logger logger;
+
+ public Slf4jLogger(org.slf4j.Logger logger) {
+ this.logger = logger;
+ }
+
+ public void debug(String message) {
+ logger.debug(message);
+ }
+
+ public void debug(String message, Throwable throwable) {
+ logger.debug(message, throwable);
+ }
+
+ public boolean isDebugEnabled() {
+ return logger.isDebugEnabled();
+ }
+
+ public void info(String message) {
+ logger.info(message);
+ }
+
+ public void info(String message, Throwable throwable) {
+ logger.info(message, throwable);
+ }
+
+ public boolean isInfoEnabled() {
+ return logger.isInfoEnabled();
+ }
+
+ public void warn(String message) {
+ logger.warn(message);
+ }
+
+ public void warn(String message, Throwable throwable) {
+ logger.warn(message, throwable);
+ }
+
+ public boolean isWarnEnabled() {
+ return logger.isWarnEnabled();
+ }
+
+ public void error(String message) {
+ logger.error(message);
+ }
+
+ public void error(String message, Throwable throwable) {
+ logger.error(message, throwable);
+ }
+
+ public boolean isErrorEnabled() {
+ return logger.isErrorEnabled();
+ }
+
+ public void fatalError(String message) {
+ logger.error(message);
+ }
+
+ public void fatalError(String message, Throwable throwable) {
+ logger.error(message, throwable);
+ }
+
+ public boolean isFatalErrorEnabled() {
+ return logger.isErrorEnabled();
+ }
+
+ public int getThreshold() {
+ return 0;
+ }
+
+ public void setThreshold(int threshold) {
+ }
+
+ public Logger getChildLogger(String name) {
+ return null;
+ }
+
+ public String getName() {
+ return logger.getName();
+ }
+
+}
Added:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java?rev=1396842&view=auto
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java
(added)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java
Wed Oct 10 22:48:08 2012
@@ -0,0 +1,52 @@
+package org.apache.maven.cli.logging;
+
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.LoggerManager;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Use an SLF4J {@link org.slf4j.ILoggerFactory} as a backing for a Plexus
{@link org.codehaus.plexus.logging.LoggerManager}.
+ *
+ * @author Jason van Zyl
+ */
+public class Slf4jLoggerManager implements LoggerManager {
+
+ private ILoggerFactory loggerFactory;
+
+ public Slf4jLoggerManager() {
+ loggerFactory = LoggerFactory.getILoggerFactory();
+ }
+
+ public Logger getLoggerForComponent(String role) {
+ return new Slf4jLogger(loggerFactory.getLogger(role));
+ }
+
+ public Logger getLoggerForComponent(String role, String hint) {
+ return new Slf4jLogger(loggerFactory.getLogger(role + "." + hint));
+ }
+
+ //
+ // Trying to give loggers back is a bad idea. Ceki said so :-)
+ //
+ public void returnComponentLogger(String role) {
+ }
+
+ public void returnComponentLogger(String role, String hint) {
+ }
+
+ public int getThreshold() {
+ return 0;
+ }
+
+ public void setThreshold(int threshold) {
+ }
+
+ public void setThresholds(int threshold) {
+ }
+
+ public int getActiveLoggerCount() {
+ return 0;
+ }
+
+}
Copied:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
(from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractMavenTransferListener.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java?p2=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java&p1=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractMavenTransferListener.java&r1=1396668&r2=1396842&rev=1396842&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/AbstractMavenTransferListener.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
Wed Oct 10 22:48:08 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.cli;
+package org.apache.maven.cli.transfer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,11 +19,11 @@ package org.apache.maven.cli;
* under the License.
*/
-import java.io.PrintStream;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
+import org.slf4j.Logger;
import org.sonatype.aether.transfer.AbstractTransferListener;
import org.sonatype.aether.transfer.TransferCancelledException;
import org.sonatype.aether.transfer.TransferEvent;
@@ -33,11 +33,13 @@ public abstract class AbstractMavenTrans
extends AbstractTransferListener
{
- protected PrintStream out;
+ protected Logger out;
+ //protected PrintStream out;
- protected AbstractMavenTransferListener( PrintStream out )
+ protected AbstractMavenTransferListener( Logger out )
{
- this.out = ( out != null ) ? out : System.out;
+ this.out = out;
+ //this.out = ( out != null ) ? out : System.out;
}
@Override
@@ -45,7 +47,7 @@ public abstract class AbstractMavenTrans
{
String message = event.getRequestType() ==
TransferEvent.RequestType.PUT ? "Uploading" : "Downloading";
- out.println( message + ": " + event.getResource().getRepositoryUrl() +
event.getResource().getResourceName() );
+ out.info( message + ": " + event.getResource().getRepositoryUrl() +
event.getResource().getResourceName() );
}
@Override
@@ -54,7 +56,7 @@ public abstract class AbstractMavenTrans
{
TransferResource resource = event.getResource();
- out.println( "[WARNING] " + event.getException().getMessage() + " for
" + resource.getRepositoryUrl()
+ out.warn( "[WARNING] " + event.getException().getMessage() + " for " +
resource.getRepositoryUrl()
+ resource.getResourceName() );
}
@@ -77,7 +79,7 @@ public abstract class AbstractMavenTrans
throughput = " at " + format.format( kbPerSec ) + " KB/sec";
}
- out.println( type + ": " + resource.getRepositoryUrl() +
resource.getResourceName() + " (" + len
+ out.info( type + ": " + resource.getRepositoryUrl() +
resource.getResourceName() + " (" + len
+ throughput + ")" );
}
}
Copied:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
(from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/BatchModeMavenTransferListener.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java?p2=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java&p1=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/BatchModeMavenTransferListener.java&r1=1396668&r2=1396842&rev=1396842&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/BatchModeMavenTransferListener.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java
Wed Oct 10 22:48:08 2012
@@ -1,4 +1,6 @@
-package org.apache.maven.cli;
+package org.apache.maven.cli.transfer;
+
+import org.slf4j.Logger;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,12 +21,10 @@ package org.apache.maven.cli;
* under the License.
*/
-import java.io.PrintStream;
-
public class BatchModeMavenTransferListener
extends AbstractMavenTransferListener
{
- public BatchModeMavenTransferListener( PrintStream out )
+ public BatchModeMavenTransferListener( Logger out )
{
super( out );
}
Copied:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
(from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ConsoleMavenTransferListener.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java?p2=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java&p1=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ConsoleMavenTransferListener.java&r1=1396668&r2=1396842&rev=1396842&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ConsoleMavenTransferListener.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
Wed Oct 10 22:48:08 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.cli;
+package org.apache.maven.cli.transfer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,10 @@ package org.apache.maven.cli;
* under the License.
*/
-import java.io.PrintStream;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.slf4j.Logger;
import org.sonatype.aether.transfer.TransferCancelledException;
import org.sonatype.aether.transfer.TransferEvent;
import org.sonatype.aether.transfer.TransferResource;
@@ -40,7 +40,7 @@ public class ConsoleMavenTransferListene
private int lastLength;
- public ConsoleMavenTransferListener( PrintStream out )
+ public ConsoleMavenTransferListener( Logger out )
{
super( out );
}
@@ -70,7 +70,7 @@ public class ConsoleMavenTransferListene
pad( buffer, pad );
buffer.append( '\r' );
- out.print( buffer );
+ out.info( buffer.toString() );
}
private String getStatus( long complete, long total )
@@ -127,7 +127,7 @@ public class ConsoleMavenTransferListene
StringBuilder buffer = new StringBuilder( 64 );
pad( buffer, lastLength );
buffer.append( '\r' );
- out.print( buffer );
+ out.info( buffer.toString() );
}
}
Copied:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java
(from r1396668,
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/QuietMavenTransferListener.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java?p2=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java&p1=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/QuietMavenTransferListener.java&r1=1396668&r2=1396842&rev=1396842&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/QuietMavenTransferListener.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java
Wed Oct 10 22:48:08 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.cli;
+package org.apache.maven.cli.transfer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/maven-3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1396842&r1=1396841&r2=1396842&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Wed Oct 10 22:48:08 2012
@@ -211,10 +211,21 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
+ <artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
<scope>runtime</scope>
+<<<<<<< HEAD
</dependency>
+=======
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4jVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+>>>>>>> 4595e08... o Use SLF4J for logging
<!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
