Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5cfcb2f5 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5cfcb2f5 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5cfcb2f5 Branch: refs/heads/master Commit: 5cfcb2f5b0ddb6571283b7086b9a8ff9ba531726 Parents: 5e771fb d525912 Author: Jason van Zyl <[email protected]> Authored: Sun Jul 21 14:09:52 2013 -0400 Committer: Jason van Zyl <[email protected]> Committed: Sun Jul 21 14:09:52 2013 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/maven/eventspy/AbstractEventSpy.java | 1 + maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java | 1 + .../org/apache/maven/eventspy/internal/EventSpyDispatcher.java | 1 + .../apache/maven/eventspy/internal/EventSpyExecutionListener.java | 1 + .../maven/eventspy/internal/EventSpyRepositoryListener.java | 1 + .../java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java | 1 + .../java/org/apache/maven/cli/logging/Slf4jConfiguration.java | 1 + .../org/apache/maven/cli/logging/Slf4jConfigurationFactory.java | 1 + .../src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java | 1 + .../main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java | 3 +++ .../org/apache/maven/cli/logging/impl/Log4j2Configuration.java | 1 + .../org/apache/maven/cli/logging/impl/LogbackConfiguration.java | 1 + .../apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java | 1 + 13 files changed, 15 insertions(+) ----------------------------------------------------------------------
