[libslf4j-java] 01/02: Merge tag 'upstream/1.7.19'

[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 bd1e2335af46afc4e22d5a4e152bdd0da941ed32
Merge: 9e21955 d7aae6e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Mar 21 10:37:36 2016 +0100

    Merge tag 'upstream/1.7.19'
    
    Upstream version 1.7.19

 integration/build.xml                              |  17 +-
 integration/pom.xml                                |   2 +-
 .../slf4j/MissingSingletonMethodAssertionTest.java |   2 +-
 .../test/java/org/slf4j/issues/Issue324Test.java   |   3 +-
 jcl-over-slf4j/pom.xml                             |   2 +-
 jul-to-slf4j/pom.xml                               |   2 +-
 .../slf4j/bridge/SLF4JBridgeHandlerPerfTest.java   |   2 +-
 .../org/slf4j/bridge/SLF4JBridgeHandlerTest.java   |  10 +-
 log4j-over-slf4j/pom.xml                           |   2 +-
 .../src/main/java/org/apache/log4j/Category.java   |   6 +-
 .../src/main/resources/META-INF/MANIFEST.MF        |   9 +-
 .../src/test/java/org/dummy/Bug131.java            |   3 +-
 .../src/test/java/org/dummy/Bug139.java            |   2 +-
 osgi-over-slf4j/pom.xml                            |   2 +-
 pom.xml                                            |  11 +-
 slf4j-android/pom.xml                              |   2 +-
 .../java/org/slf4j/impl/AndroidLoggerAdapter.java  |   1 -
 .../java/org/slf4j/impl/AndroidLoggerFactory.java  |   5 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   2 -
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |  56 ++--
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |  70 ++---
 slf4j-api/pom.xml                                  |   2 +-
 .../src/main/java/org/slf4j/LoggerFactory.java     | 104 ++++++--
 .../main/java/org/slf4j/event/EventConstants.java  |  13 +
 .../java/org/slf4j/event/EventRecodingLogger.java  | 296 +++++++++++++++++++++
 slf4j-api/src/main/java/org/slf4j/event/Level.java |  37 +++
 .../main/java/org/slf4j/event/LoggingEvent.java    |  28 ++
 .../org/slf4j/event/SubstituteLoggingEvent.java    |  89 +++++++
 .../java/org/slf4j/helpers/BasicMDCAdapter.java    |   5 +-
 .../java/org/slf4j/helpers/FormattingTuple.java    |  16 +-
 .../java/org/slf4j/helpers/MessageFormatter.java   |  92 +++----
 .../java/org/slf4j/helpers/SubstituteLogger.java   |  60 ++++-
 .../org/slf4j/helpers/SubstituteLoggerFactory.java |  17 +-
 .../src/main/java/org/slf4j/helpers/Util.java      |  12 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |  16 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |   4 +-
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |   2 +-
 .../java/org/slf4j/spi/LocationAwareLogger.java    |   2 +
 slf4j-api/src/main/resources/META-INF/MANIFEST.MF  |   5 +-
 .../src/test/java/org/slf4j/BasicMarkerTest.java   |   2 +-
 ...va => FindStaticLoggerBinderPathsPerfTest.hava} |   0
 .../src/test/java/org/slf4j/NoBindingTest.java     |   2 +-
 .../org/slf4j/helpers/BasicMDCAdapterTest.java     |   4 +-
 .../slf4j/helpers/MessageFormatterPerfTest.java    |   2 +-
 .../org/slf4j/helpers/MessageFormatterTest.java    |  20 +-
 .../org/slf4j/helpers/SubstitutableLoggerTest.java |   5 +-
 .../slf4j/helpers/SubstituteLoggerFactoryTest.java |   2 +-
 slf4j-ext/pom.xml                                  |   2 +-
 .../main/java/org/slf4j/agent/AgentPremain.java    |  16 +-
 .../java/org/slf4j/cal10n/LocLoggerFactory.java    |  16 +-
 .../org/slf4j/instrumentation/LogTransformer.java  |  23 +-
 slf4j-ext/src/test/java/org/slf4j/NDCTest.java     |   2 -
 .../java/org/slf4j/cal10n_dummy/LocLoggerTest.java |   5 +-
 .../java/org/slf4j/dummyExt/EventLoggerTest.java   |   6 +-
 .../java/org/slf4j/dummyExt/MDCStrLookupTest.java  |   3 +-
 .../test/java/org/slf4j/dummyExt/PackageTest.java  |   2 -
 .../slf4j/instrumentation/ToStringHelperTest.java  |   2 +-
 .../test/java/org/slf4j/profiler/PackageTest.java  |   4 +-
 .../test/java/org/slf4j/profiler/ProfilerTest.java |   1 +
 slf4j-jcl/pom.xml                                  |   2 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   1 -
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |   2 +-
 .../src/test/java/org/slf4j/InvocationTest.java    |   1 -
 slf4j-jdk14/pom.xml                                |   2 +-
 .../java/org/slf4j/impl/JDK14LoggerAdapter.java    |  61 ++++-
 .../java/org/slf4j/impl/JDK14LoggerFactory.java    |   2 +
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |   4 +-
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |   2 +-
 .../src/main/resources/META-INF/MANIFEST.MF        |   5 +-
 .../test/java/org/slf4j/LoggerFactoryFriend.java   |   7 +
 .../org/slf4j/impl/JDK14AdapterLoggerNameTest.java |  31 ++-
 .../impl/MultithreadedInitializationTest.java      | 153 +++++++++++
 .../src/test/java/org/slf4j/impl/PerfTest.java     |   4 +-
 .../test/java/org/slf4j/impl/RecordingHandler.java |  26 ++
 .../org/slf4j/issue/LoggerSerializationTest.java   |   2 +-
 slf4j-log4j12/pom.xml                              |   2 +-
 .../java/org/slf4j/impl/Log4jLoggerAdapter.java    |  39 ++-
 .../java/org/slf4j/impl/Log4jLoggerFactory.java    |   4 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |   4 +-
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |   2 +-
 .../src/main/resources/META-INF/MANIFEST.MF        |   6 +-
 .../src/test/java/org/slf4j/InvocationTest.java    |   7 +-
 .../impl/MultithreadedInitializationTest.java      | 127 +++++++++
 .../java/org/slf4j/impl/RecursiveAppender.java     |  42 ++-
 .../slf4j/impl/RecursiveInitializationTest.java    |  14 +-
 .../recursiveInitWithActivationDelay.properties    |   9 +
 slf4j-migrator/pom.xml                             |   2 +-
 .../org/slf4j/migrator/internal/MigratorFrame.java |  10 -
 .../java/org/slf4j/migrator/FileConverterTest.java |   2 +-
 .../org/slf4j/migrator/ProjectConverterTest.java   |   2 +-
 .../org/slf4j/migrator/helper/AbbreviatorTest.java |   1 +
 .../org/slf4j/migrator/line/JCLRuleSetTest.java    |   3 +-
 .../org/slf4j/migrator/line/NoConversionTest.java  |   3 +-
 slf4j-nop/pom.xml                                  |   2 +-
 .../main/java/org/slf4j/impl/StaticMDCBinder.java  |   2 +-
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |   2 +-
 slf4j-nop/src/main/resources/META-INF/MANIFEST.MF  |   5 +-
 .../test/java/org/slf4j/LoggerFactoryFriend.java   |   7 +
 .../impl/MultithreadedInitializationTest.java      | 150 +++++++++++
 slf4j-simple/pom.xml                               |   2 +-
 .../src/main/java/org/slf4j/impl/SimpleLogger.java |  18 +-
 .../java/org/slf4j/impl/SimpleLoggerFactory.java   |   1 +
 .../java/org/slf4j/impl/StaticMarkerBinder.java    |   4 +-
 .../src/main/resources/META-INF/MANIFEST.MF        |   5 +-
 .../test/java/org/slf4j/LoggerFactoryFriend.java   |   7 +
 .../impl/MultithreadedInitializationTest.java      | 154 +++++++++++
 slf4j-site/pom.xml                                 |   2 +-
 107 files changed, 1715 insertions(+), 360 deletions(-)

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