This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository logback.
commit 7b8e47595aeae7da745c2a73986081b163f46b5f Merge: acb5a7b 600576d Author: Emmanuel Bourg <[email protected]> Date: Mon Dec 12 00:56:54 2016 +0100 Merge tag 'upstream/1.1.8' Upstream version 1.1.8 docs/access.html | 4 +- docs/css/screen.css | 36 ++-- docs/download.html | 4 +- docs/faq.html | 6 +- docs/images/follow_us.png | Bin 0 -> 16337 bytes docs/manual/appenders.html | 8 +- docs/manual/appenders_ja.html | 4 +- docs/manual/configuration.html | 34 +++- docs/manual/groovy.html | 2 +- docs/manual/groovy_ja.html | 6 +- docs/manual/introduction.html | 2 +- docs/manual/layouts.html | 2 +- docs/manual/layouts_ja.html | 2 +- docs/manual/loggingSeparation.html | 6 +- docs/manual/onJoran.html | 2 +- docs/news.html | 46 +++++ docs/project-reports.html | 8 +- docs/setup.html | 94 +++++++-- docs/templates/left.js | 12 +- logback-access/pom.xml | 2 +- .../access/sift/SiftingJoranConfigurator.java | 10 +- .../qos/logback/access/joran/ConditionalTest.java | 2 +- .../ch/qos/logback/access/joran/PackageTest.java | 2 +- logback-classic/osgi-build.xml | 11 + logback-classic/pom.xml | 4 +- .../classic/gaffer/ComponentDelegate.groovy | 7 +- .../qos/logback/classic/gaffer/NestedType.groovy | 2 +- .../qos/logback/classic/gaffer/PropertyUtil.groovy | 100 +++++---- .../ch/qos/logback/classic/boolex/IEvaluator.java | 2 +- .../ch/qos/logback/classic/gaffer/GafferUtil.java | 2 +- .../logback/classic/joran/JoranConfigurator.java | 2 +- .../classic/sift/SiftingJoranConfigurator.java | 10 +- .../classic/turbo/DynamicThresholdFilter.java | 2 +- .../logback/classic/turbo/MDCValueLevelPair.java | 2 +- .../java/ch/qos/logback/classic/util/EnvUtil.java | 2 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 3 +- .../gaffer/ConfigurationDelegateTest.groovy | 19 +- .../src/test/input/issue/logback-1159.xml | 30 +++ .../rolling/timeAndSizeWithoutMaxFileSize.xml | 23 +++ .../rolling/totalSizeCapSmallerThanMaxFileSize.xml | 26 +++ .../classic/boolex/ConditionalWithoutJanino.java | 2 +- .../classic/boolex/GEventEvaluatorTest.java | 2 +- .../SelectiveDateFormattingRunnable.java | 2 +- .../logback/classic/issue/lbcore211/Lbcore211.java | 2 +- .../qos/logback/classic/issue/lbcore_155/Main.java | 2 +- .../logback/classic/issue/lbcore_155/OThread.java | 2 +- .../classic/issue/logback1159/LogbackListener.java | 37 ++++ .../issue/logback1159/LogbackListenerTest.java | 66 ++++++ .../classic/issue/logback1159/LoggingError.java | 16 ++ .../TimeBasedRollingWithConfigFileTest.java | 29 +++ .../classic/sift/MDCBasedDiscriminatorTest.java | 2 +- .../logback/classic/sift/SiftingAppenderTest.java | 4 +- .../util/InitializationIntegrationTest.java | 2 +- logback-classic/src/test/java/org/slf4j/Main.java | 46 ----- logback-classic/src/test/java/org/slf4j/Main2.java | 63 ------ .../org/slf4j/impl/InitializationOutputTest.java | 2 +- .../test/java/org/slf4j/test_osgi/FelixHost.java | 2 +- logback-core/pom.xml | 2 +- .../main/java/ch/qos/logback/core/ContextBase.java | 11 +- .../java/ch/qos/logback/core/CoreConstants.java | 2 +- .../java/ch/qos/logback/core/FileAppender.java | 21 +- .../ch/qos/logback/core/db/dialect/SQLDialect.java | 2 +- .../java/ch/qos/logback/core/encoder/Encoder.java | 2 +- .../logback/core/hook/DelayingShutdownHook.java | 3 +- .../logback/core/joran/GenericConfigurator.java | 5 +- .../logback/core/joran/JoranConfiguratorBase.java | 13 +- .../qos/logback/core/joran/action/ActionConst.java | 2 +- .../core/joran/action/NestedBasicPropertyIA.java | 1 + .../core/joran/spi/ConfigurationWatchList.java | 2 +- .../joran/spi/DefaultNestedComponentRegistry.java | 2 +- .../ch/qos/logback/core/joran/spi/Interpreter.java | 2 +- .../joran/util/ConfigurationWatchListUtil.java | 2 +- .../logback/core/joran/util/PropertySetter.java | 24 +-- .../core/joran/util/StringToObjectConverter.java | 29 +-- .../joran/util/beans/BeanDescriptionCache.java | 19 +- .../joran/util/beans/BeanDescriptionFactory.java | 95 ++++----- .../logback/core/joran/util/beans/BeanUtil.java | 225 ++++++++++----------- .../ch/qos/logback/core/net/SMTPAppenderBase.java | 1 - .../core/property/FileExistsPropertyDefiner.java | 2 +- ...aultTimeBasedFileNamingAndTriggeringPolicy.java | 2 +- .../core/rolling/SizeAndTimeBasedFNATP.java | 54 +++-- .../rolling/SizeAndTimeBasedRollingPolicy.java | 21 +- .../core/rolling/SizeBasedTriggeringPolicy.java | 45 +---- ...TimeBasedFileNamingAndTriggeringPolicyBase.java | 8 +- .../core/rolling/TimeBasedRollingPolicy.java | 22 +- .../logback/core/rolling/helper/Compressor.java | 7 +- .../core/rolling/helper/DateTokenConverter.java | 2 +- .../core/rolling/helper/MonoTypedConverter.java | 2 +- .../rolling/helper/TimeBasedArchiveRemover.java | 18 +- .../logback/core/sift/DefaultDiscriminator.java | 2 +- .../qos/logback/core/spi/CyclicBufferTracker.java | 2 +- .../java/ch/qos/logback/core/spi/LogbackLock.java | 2 +- .../qos/logback/core/status/NopStatusListener.java | 2 +- .../core/status/OnErrorConsoleStatusListener.java | 2 +- .../status/OnPrintStreamStatusListenerBase.java | 2 +- .../core/subst/NodeToStringTransformer.java | 2 +- .../logback/core/util/CachingDateFormatter.java | 2 +- .../java/ch/qos/logback/core/util/EnvUtil.java | 2 +- .../test/input/{compress3.txt => compress2.txt} | 8 - .../qos/logback/core/joran/SimpleConfigurator.java | 9 +- .../core/joran/replay/FruitConfigurator.java | 10 +- .../core/joran/spi/ConfigurationWatchListTest.java | 2 +- .../ch/qos/logback/core/joran/util/Citrus.java | 15 ++ .../java/ch/qos/logback/core/joran/util/House.java | 9 +- .../ch/qos/logback/core/joran/util/Orange.java | 9 + .../core/joran/util/PropertySetterTest.java | 27 ++- .../core/recovery/ResilientOutputStreamTest.java | 2 +- .../JVMExitBeforeCompressionISDoneTest.java | 113 +++++++++++ .../core/rolling/MultiThreadedRollingTest.java | 4 +- .../core/rolling/ScaffoldingForRollingTests.java | 2 +- .../core/rolling/SizeAndTimeBasedFNATP_Test.java | 4 +- .../logback/core/rolling/SizeBasedRollingTest.java | 15 +- .../rolling/SizeBasedTriggeringPolicyTest.java | 57 ------ ...BasedFileNamingAndTriggeringPolicyBaseTest.java | 5 +- .../logback/core/rolling/TimeBasedRollingTest.java | 59 +----- .../TimeBasedRollingWithArchiveRemoval_Test.java | 106 +++++----- .../core/rolling/helper/RollingCalendarTest.java | 8 +- .../core/spi/CyclicBufferTrackerSimulator.java | 2 +- .../qos/logback/core/spi/CyclicBufferTrackerT.java | 2 +- .../logback/core/spi/CyclicBufferTrackerTest.java | 2 +- .../spi/ScenarioBasedCyclicBufferTrackerTest.java | 2 +- .../ch/qos/logback/core/status/StatusUtilTest.java | 2 +- .../core/subst/NodeToStringTransformerTest.java | 2 +- .../ch/qos/logback/core/testUtil/FileTestUtil.java | 2 +- logback-examples/pom.xml | 2 +- logback-examples/setClasspath.cmd | 8 +- logback-examples/setClasspath.sh | 8 +- .../main/java/chapters/appenders/mail/EMail.java | 4 +- .../java/chapters/architecture/SelectionRule.java | 2 +- .../java/chapters/onJoran/SimpleConfigurator.java | 2 +- .../chapters/onJoran/calculator/Calculator1.java | 2 +- .../chapters/onJoran/calculator/Calculator2.java | 2 +- .../java/chapters/onJoran/implicit/PrintMe.java | 2 +- .../onJoran/newRule/NewRuleCalculator.java | 2 +- logback-site/pom.xml | 2 +- logback-site/src/site/pages/css/screen.css | 36 ++-- logback-site/src/site/pages/manual/appenders.html | 4 +- .../src/site/pages/manual/appenders_ja.html | 4 +- .../src/site/pages/manual/configuration.html | 34 +++- logback-site/src/site/pages/manual/groovy.html | 2 +- logback-site/src/site/pages/manual/groovy_ja.html | 2 +- logback-site/src/site/pages/manual/layouts.html | 2 +- logback-site/src/site/pages/manual/layouts_ja.html | 2 +- logback-site/src/site/pages/news.html | 46 +++++ logback-site/src/site/pages/setup.html | 80 +++++++- logback-site/src/site/pages/templates/left.js | 12 +- .../src/site/resources/images/follow_us.png | Bin 0 -> 16337 bytes pom.xml | 40 ++-- src/main/assembly/dist.xml | 11 + src/main/clas/signed-clas.txt | 2 + 150 files changed, 1402 insertions(+), 877 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/logback.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
