[libslf4j-java] 01/03: Merge tag 'upstream/1.7.13'

[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 744bc9aa4390a789779f46b02276dd26a2c15466
Merge: 28bb834 d8b4273
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 19 09:38:46 2015 +0100

    Merge tag 'upstream/1.7.13'
    
    Upstream version 1.7.13

 integration/build.xml                              |  37 +++++-
 integration/pom.xml                                |  11 +-
 .../src/main/resources/META-INF/MANIFEST.MF        |   0
 integration/src/policy/java-eclipse.policy         |  10 ++
 integration/src/policy/java-under-ant.policy       |  13 ++
 .../test/java/org/slf4j/issues/Issue324Test.java   |  17 +++
 jcl-over-slf4j/pom.xml                             |  38 +-----
 .../org/apache/commons/logging/InvokeJCLTest.java  |   9 +-
 .../commons/logging/impl/SerializationTest.java    |  22 +--
 jul-to-slf4j/pom.xml                               |  38 +-----
 .../java/org/slf4j/bridge/SLF4JBridgeHandler.java  |  14 +-
 .../slf4j/bridge/SLF4JBridgeHandlerPerfTest.java   |  20 ++-
 .../org/slf4j/bridge/SLF4JBridgeHandlerTest.java   |  39 ++++--
 log4j-over-slf4j/pom.xml                           |  41 ++----
 .../src/main/java/org/apache/log4j/Appender.java   |   1 -
 .../src/main/java/org/apache/log4j/Category.java   |  11 +-
 .../src/main/java/org/apache/log4j/LogManager.java |   2 +-
 .../src/main/java/org/apache/log4j/spi/Layout.java |  20 ---
 .../src/test/java/org/apache/log4j/NDCTest.java    |  13 +-
 .../src/test/java/org/dummy/Bug131.java            |   9 +-
 .../src/test/java/org/dummy/Bug139.java            |   8 +-
 osgi-over-slf4j/pom.xml                            |   3 +-
 pom.xml                                            |  57 ++++++--
 slf4j-android/pom.xml                              |  41 +-----
 .../java/org/slf4j/impl/AndroidLoggerAdapter.java  |   6 +-
 slf4j-api/pom.xml                                  |  33 +++--
 .../src/main/java/org/slf4j/LoggerFactory.java     |  23 ++--
 slf4j-api/src/main/java/org/slf4j/MDC.java         |   2 +-
 .../java/org/slf4j/helpers/BasicMDCAdapter.java    |  70 ++++------
 .../main/java/org/slf4j/helpers/BasicMarker.java   |  10 +-
 .../java/org/slf4j/helpers/MessageFormatter.java   |  10 +-
 .../src/main/java/org/slf4j/helpers/Util.java      |  49 ++++++-
 .../src/test/java/org/slf4j/BasicMarkerTest.java   |  18 ++-
 .../src/test/java/org/slf4j/NoBindingTest.java     |  13 +-
 .../org/slf4j/helpers/BasicMDCAdapterTest.java     | 148 +++++++++++++++++++++
 .../java/org/slf4j/helpers/BubbleSortTest.java     |  13 +-
 .../slf4j/helpers/MessageFormatterPerfTest.java    |  16 +--
 .../org/slf4j/helpers/SubstitutableLoggerTest.java |   8 +-
 .../slf4j/helpers/SubstituteLoggerFactoryTest.java |  11 +-
 slf4j-ext/pom.xml                                  |  34 +----
 slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java |   2 +-
 .../org/slf4j/instrumentation/JavassistHelper.java |   2 +-
 slf4j-ext/src/test/java/org/slf4j/NDCTest.java     |  20 +--
 .../java/org/slf4j/cal10n_dummy/LocLoggerTest.java |  19 +--
 .../java/org/slf4j/cal10n_dummy/PackageTest.java   |  14 +-
 .../java/org/slf4j/dummyExt/EventLoggerTest.java   |  20 +--
 .../java/org/slf4j/dummyExt/MDCStrLookupTest.java  |  19 +--
 .../test/java/org/slf4j/dummyExt/PackageTest.java  |  14 +-
 .../test/java/org/slf4j/dummyExt/XLoggerTest.java  |  24 ++--
 .../slf4j/instrumentation/ToStringHelperTest.java  |   7 +-
 .../test/java/org/slf4j/profiler/PackageTest.java  |  16 +--
 .../test/java/org/slf4j/profiler/ProfilerTest.java |  15 ++-
 .../src/test/java/org/slf4j/profiler/UtilTest.java |  17 +--
 slf4j-jcl/pom.xml                                  |  25 +---
 .../src/test/java/org/slf4j/InvocationTest.java    |  24 ++--
 slf4j-jdk14/pom.xml                                |  30 +----
 .../java/org/slf4j/impl/JDK14LoggerAdapter.java    |   4 +-
 .../org/slf4j/impl/JDK14AdapterLoggerNameTest.java |  18 ++-
 .../src/test/java/org/slf4j/impl/PerfTest.java     |  18 +--
 .../org/slf4j/issue/LoggerSerializationTest.java   |   7 +-
 slf4j-log4j12/pom.xml                              |  29 +---
 .../java/org/slf4j/impl/Log4jLoggerAdapter.java    |   2 +-
 .../src/test/java/org/slf4j/InvocationTest.java    |  39 ++++--
 .../slf4j/impl/RecursiveInitializationTest.java    |  17 +--
 slf4j-migrator/pom.xml                             |  35 +----
 .../org/slf4j/migrator/helper/Abbreviator.java     |   2 +-
 .../java/org/slf4j/migrator/FileConverterTest.java |  24 +---
 .../org/slf4j/migrator/ProjectConverterTest.java   |  10 +-
 .../org/slf4j/migrator/helper/AbbreviatorTest.java |  25 ++--
 .../org/slf4j/migrator/line/JCLRuleSetTest.java    |  15 ++-
 .../org/slf4j/migrator/line/NoConversionTest.java  |  11 +-
 .../slf4j/migrator/line/TrivialMatcherTest.java    |   7 +-
 slf4j-nop/pom.xml                                  |  31 +----
 .../src/test/java/org/slf4j/InvocationTest.java    |  26 ++--
 slf4j-simple/pom.xml                               |  25 +---
 .../org/slf4j/DetectLoggerNameMismatchTest.java    |   6 +-
 .../src/test/java/org/slf4j/InvocationTest.java    |  32 +++--
 77 files changed, 817 insertions(+), 772 deletions(-)

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