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 459ee73082a4f36a062958c1618e108e13b7a080 Merge: c30f36a 9429776 Author: Emmanuel Bourg <[email protected]> Date: Tue May 16 15:56:10 2017 +0200 Merge tag 'upstream/1.7.25' Upstream version 1.7.25 LICENSE.txt | 2 +- integration/pom.xml | 5 +- .../test/java/org/slf4j/test_osgi/FelixHost.java | 6 +- jcl-over-slf4j/pom.xml | 6 +- .../src/main/resources/META-INF/MANIFEST.MF | 4 +- jul-to-slf4j/pom.xml | 2 +- log4j-over-slf4j/pom.xml | 2 +- osgi-over-slf4j/pom.xml | 2 +- pom.xml | 8 +- slf4j-android/pom.xml | 2 +- slf4j-api/pom.xml | 35 +- .../src/main/java/org/slf4j/LoggerFactory.java | 6 +- .../java/org/slf4j/event/EventRecodingLogger.java | 2 +- .../main/java/org/slf4j/helpers/BasicMarker.java | 46 +-- .../src/main/java/org/slf4j/helpers/Util.java | 4 + .../slf4j/FindStaticLoggerBinderPathsPerfTest.hava | 55 --- slf4j-ext/pom.xml | 3 +- slf4j-jcl/pom.xml | 2 +- slf4j-jdk14/pom.xml | 2 +- slf4j-log4j12/pom.xml | 2 +- .../src/main/java/org/apache/log4j/MDCFriend.java | 33 ++ .../java/org/slf4j/impl/Log4jLoggerFactory.java | 2 +- .../main/java/org/slf4j/impl/Log4jMDCAdapter.java | 109 +++--- .../main/java/org/slf4j/impl/StaticMDCBinder.java | 50 +-- .../src/main/java/org/slf4j/impl/VersionUtil.java | 33 ++ .../test/java/org/apache/log4j/MDCFriendTest.java | 32 ++ .../src/test/java/org/slf4j/InvocationTest.java | 8 +- .../test/java/org/slf4j/impl/UtilVersionTest.java | 24 ++ slf4j-migrator/pom.xml | 2 +- slf4j-nop/pom.xml | 2 +- slf4j-simple/pom.xml | 2 +- .../src/main/java/org/slf4j/impl/OutputChoice.java | 55 +++ .../src/main/java/org/slf4j/impl/SimpleLogger.java | 417 +++++++++------------ .../org/slf4j/impl/SimpleLoggerConfiguration.java | 186 +++++++++ .../test/java/org/slf4j/impl/SimpleLoggerTest.java | 44 ++- slf4j-site/pom.xml | 2 +- 36 files changed, 750 insertions(+), 447 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libslf4j-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
