[libslf4j-java] 02/03: Merge tag 'upstream/1.7.22'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libslf4j-java.

commit 6cdfd6a94891017d8ee7e076974fda6ccab721a2
Merge: 0c18d8e 8a713f5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 19 09:30:13 2016 +0100

    Merge tag 'upstream/1.7.22'
    
    Upstream version 1.7.22

 integration/pom.xml                                |  2 +-
 .../test/java/org/slf4j/test_osgi/FelixHost.java   |  2 +-
 jcl-over-slf4j/pom.xml                             |  2 +-
 .../org/apache/commons/logging/LogFactory.java     |  4 +-
 .../org/apache/commons/logging/impl/SimpleLog.java | 11 +++--
 jul-to-slf4j/pom.xml                               |  2 +-
 log4j-over-slf4j/pom.xml                           |  2 +-
 .../src/main/java/org/apache/log4j/Appender.java   |  2 +-
 .../src/main/java/org/apache/log4j/Category.java   |  2 +-
 .../src/main/java/org/apache/log4j/Level.java      |  4 +-
 .../apache/log4j/spi/HierarchyEventListener.java   |  2 +-
 .../src/test/java/org/apache/log4j/NDCTest.java    |  2 +-
 osgi-over-slf4j/pom.xml                            |  2 +-
 pom.xml                                            |  6 +--
 slf4j-android/pom.xml                              |  2 +-
 .../org/slf4j/impl/AndroidLoggerFactoryTest.java   |  2 +-
 slf4j-api/pom.xml                                  |  2 +-
 slf4j-api/src/main/java/org/slf4j/MDC.java         |  2 +-
 .../src/main/java/org/slf4j/helpers/NOPLogger.java |  2 +-
 .../java/org/slf4j/helpers/NamedLoggerBase.java    |  3 +-
 .../java/org/slf4j/spi/LoggerFactoryBinder.java    |  4 +-
 .../src/main/java/org/slf4j/spi/MDCAdapter.java    |  2 +-
 .../java/org/slf4j/spi/MarkerFactoryBinder.java    |  4 +-
 .../slf4j/FindStaticLoggerBinderPathsPerfTest.hava | 55 ++++++++++++++++++++++
 slf4j-ext/pom.xml                                  |  2 +-
 .../java/org/slf4j/cal10n/LocLoggerFactory.java    |  2 +-
 .../src/main/java/org/slf4j/ext/EventData.java     |  6 +--
 .../main/java/org/slf4j/ext/EventException.java    |  2 +-
 .../org/slf4j/instrumentation/JavassistHelper.java |  6 +--
 .../org/slf4j/instrumentation/LogTransformer.java  |  2 +-
 .../src/main/java/org/slf4j/profiler/Profiler.java |  2 +-
 .../main/java/org/slf4j/profiler/StopWatch.java    |  2 +-
 .../java/org/slf4j/profiler/TimeInstrument.java    |  2 +-
 slf4j-jcl/pom.xml                                  |  2 +-
 slf4j-jdk14/pom.xml                                |  2 +-
 .../src/test/java/org/slf4j/InvocationTest.java    |  4 +-
 .../src/test/java/org/slf4j/impl/PerfTest.java     |  2 +-
 .../org/slf4j/issue/LoggerSerializationTest.java   |  6 +--
 slf4j-log4j12/pom.xml                              |  2 +-
 slf4j-migrator/pom.xml                             |  2 +-
 .../org/slf4j/migrator/AternativeApproach.java     |  6 +--
 slf4j-nop/pom.xml                                  |  2 +-
 slf4j-simple/pom.xml                               |  2 +-
 .../src/main/java/org/slf4j/impl/SimpleLogger.java | 25 +++++++---
 .../java/org/slf4j/impl/SimpleLoggerFactory.java   |  2 +-
 .../test/java/org/slf4j/impl/SimpleLoggerTest.java | 11 ++++-
 slf4j-site/pom.xml                                 |  2 +-
 47 files changed, 149 insertions(+), 70 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libslf4j-java.git