[apache-log4j2] 01/02: Merge tag 'upstream/2.6.2'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jul 14 17:43:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository apache-log4j2.
commit 4437d3234543daf33c0ff9283ffb109d60d8c12d
Merge: d96e0c3 f383ee5
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jul 14 19:31:29 2016 +0200
Merge tag 'upstream/2.6.2'
Upstream version 2.6.2
BUILDING.txt | 2 +-
RELEASE-NOTES.txt | 60 +-
log4j-1.2-api/pom.xml | 2 +-
log4j-api/pom.xml | 2 +-
.../logging/log4j/CloseableThreadContext.java | 2 +-
.../main/java/org/apache/logging/log4j/Logger.java | 50 +-
.../log4j/message/DefaultFlowMessageFactory.java | 15 +-
.../logging/log4j/message/MessageFactory2.java | 111 +-
.../logging/log4j/message/ObjectMessage.java | 14 +
.../logging/log4j/message/ParameterFormatter.java | 21 +
.../log4j/message/ParameterizedMessage.java | 15 +-
.../log4j/message/ReusableObjectMessage.java | 14 +
.../apache/logging/log4j/spi/AbstractLogger.java | 34 +-
.../org/apache/logging/log4j/util/Activator.java | 1 +
.../org/apache/logging/log4j/util/Constants.java | 61 +
.../org/apache/logging/log4j/util/LoaderUtil.java | 1 +
.../org/apache/logging/log4j/util/Supplier.java | 1 +
.../java/org/apache/logging/log4j/util/Unbox.java | 106 +-
.../java/org/apache/logging/log4j/LoggerTest.java | 62 +-
.../org/apache/logging/log4j/TraceLoggingTest.java | 317 ++
.../message/ReusableParameterizedMessageTest.java | 6 +
.../logging/log4j/util/UnboxConfigurableTest.java | 67 +
.../org/apache/logging/log4j/util/UnboxTest.java | 20 +-
log4j-bom/pom.xml | 6 +-
log4j-core/pom.xml | 5 +-
.../apache/logging/log4j/core/LoggerContext.java | 5 +
.../logging/log4j/core/appender/AsyncAppender.java | 3 +
.../log4j/core/appender/ConsoleAppender.java | 58 +-
.../core/appender/MemoryMappedFileManager.java | 2 +
.../log4j/core/appender/OutputStreamManager.java | 10 +-
.../log4j/core/appender/RollingFileAppender.java | 2 +
.../appender/RollingRandomAccessFileAppender.java | 2 +
.../appender/rolling/CronTriggeringPolicy.java | 37 +-
.../appender/rolling/DefaultRolloverStrategy.java | 9 +-
.../rolling/OnStartupTriggeringPolicy.java | 50 +-
.../core/appender/rolling/PatternProcessor.java | 12 +-
.../core/appender/rolling/RollingFileManager.java | 20 +-
.../rolling/RollingRandomAccessFileManager.java | 6 +-
.../rolling/action/CommonsCompressAction.java | 9 +-
.../appender/rolling/action/FileRenameAction.java | 70 +-
.../logging/log4j/core/async/AsyncLogger.java | 1 -
.../logging/log4j/core/config/Configuration.java | 6 +-
.../log4j/core/config/ConfigurationFactory.java | 19 +-
.../log4j/core/config/ConfigurationScheduler.java | 24 +-
.../logging/log4j/core/config/Configurator.java | 3 +-
.../log4j/core/config/CronScheduledFuture.java | 43 +-
.../config/builder/api/ConfigurationBuilder.java | 1 -
.../config/builder/impl/BuiltConfiguration.java | 1 +
.../config/composite/DefaultMergeStrategy.java | 3 +-
.../logging/log4j/core/filter/AbstractFilter.java | 3 +-
.../log4j/core/filter/AbstractFilterable.java | 8 +-
.../logging/log4j/core/filter/CompositeFilter.java | 7 +-
.../log4j/core/filter/DynamicThresholdFilter.java | 2 +-
.../logging/log4j/core/filter/ThresholdFilter.java | 16 +-
.../log4j/core/jackson/LogEventJsonMixIn.java | 2 -
.../log4j/core/layout/AbstractJacksonLayout.java | 1 -
.../log4j/core/layout/AbstractStringLayout.java | 16 +
.../log4j/core/layout/CsvParameterLayout.java | 1 -
.../logging/log4j/core/layout/GelfLayout.java | 32 +-
.../logging/log4j/core/layout/PatternLayout.java | 15 +-
.../log4j/core/pattern/NameAbbreviator.java | 102 +-
.../log4j/core/util/CloseShieldOutputStream.java | 3 +
.../apache/logging/log4j/core/util/Constants.java | 6 +-
.../apache/logging/log4j/core/util/Throwables.java | 60 +-
.../log4j/core/GcFreeMixedSyncAyncLoggingTest.java | 1 -
.../log4j/core/GcFreeSynchronousLoggingTest.java | 1 -
.../appender/AsyncAppenderQueueFullPolicyTest.java | 33 +-
.../ConsoleAppenderAnsiStyleLayoutMain.java | 40 +-
...n.java => ConsoleAppenderJAnsiMessageMain.java} | 43 +-
.../log4j/core/appender/ConsoleAppenderTest.java | 14 +-
.../log4j/core/appender/FileAppenderTest.java | 43 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 66 +-
...ava => RandomRollingAppenderOnStartupTest.java} | 49 +-
.../appender/rolling/RollingAppenderCronTest.java | 66 +-
.../RollingAppenderCustomDeleteActionTest.java | 28 +-
...RollingAppenderDeleteAccumulatedCount1Test.java | 29 +-
...RollingAppenderDeleteAccumulatedCount2Test.java | 29 +-
.../RollingAppenderDeleteAccumulatedSizeTest.java | 28 +-
.../rolling/RollingAppenderDeleteMaxDepthTest.java | 28 +-
.../rolling/RollingAppenderDeleteNestedTest.java | 29 +-
.../RollingAppenderDeleteScriptFri13thTest.java | 29 +-
.../rolling/RollingAppenderDeleteScriptTest.java | 27 +-
.../RollingAppenderNoUnconditionalDeleteTest.java | 6 +-
.../rolling/RollingAppenderOnStartupTest.java | 45 +-
.../appender/rolling/RollingAppenderSizeTest.java | 55 +-
.../rolling/RollingAppenderTimeAndSizeTest.java | 29 +-
.../appender/rolling/RollingAppenderTimeTest.java | 36 +-
.../rolling/RollingAppenderUncompressedTest.java | 28 +-
.../rolling/RollingFileAppenderAccessTest.java | 4 +-
...ingRandomAccessFileManagerHeaderFooterTest.java | 29 +-
.../RollingRandomAccessFileManagerTest.java | 155 +-
.../appender/routing/JsonRoutingAppender2Test.java | 16 +-
.../appender/routing/JsonRoutingAppenderTest.java | 16 +-
.../routing/PropertiesRoutingAppenderTest.java | 23 +-
.../core/appender/routing/RoutingAppenderTest.java | 11 +-
.../routing/RoutingAppenderWithJndiTest.java | 6 +-
.../routing/RoutingAppenderWithPurgingTest.java | 21 +-
.../routing/RoutingDefaultAppenderTest.java | 16 +-
.../core/config/CompositeConfigurationTest.java | 6 -
.../log4j/core/filter/AbstractFilterableTest.java | 12 +-
.../log4j/core/impl/MutableLogEventTest.java | 1 -
.../core/impl/ReusableLogEventFactoryTest.java | 2 +
.../core/layout/AbstractStringLayoutTest.java | 72 +
.../layout/CsvParameterLayoutAllAsyncTest.java | 1 -
.../SequenceNumberPatternConverterTest.java | 51 +
.../logging/log4j/core/util/ThrowablesTest.java | 4 +-
...Files.java => AbstractExternalFileCleaner.java} | 160 +-
.../org/apache/logging/log4j/junit/CleanFiles.java | 58 +-
.../apache/logging/log4j/junit/CleanFolders.java | 105 +
.../logging/log4j/junit/LoggerContextRule.java | 93 +-
.../log4j/test/appender/BlockingAppender.java | 4 +-
.../SequenceNumberPatternConverterTest.yml | 15 +
log4j-core/src/test/resources/log4j-rolling-7z.xml | 58 +
log4j-core/src/test/resources/log4j-test5.xml | 36 +
log4j-distribution/pom.xml | 2 +-
log4j-flume-ng/pom.xml | 2 +-
log4j-iostreams/pom.xml | 2 +-
log4j-jcl/pom.xml | 2 +-
log4j-jmx-gui/pom.xml | 2 +-
log4j-jul/pom.xml | 2 +-
log4j-liquibase/pom.xml | 2 +-
log4j-nosql/pom.xml | 2 +-
log4j-perf/pom.xml | 2 +-
...bstractStringLayoutStringEncodingBenchmark.java | 4 +-
.../jmh/AsyncAppenderLog4j2LocationBenchmark.java | 2 -
.../perf/jmh/AsyncAppenderLogbackBenchmark.java | 1 -
.../jmh/AsyncAppenderLogbackLocationBenchmark.java | 2 -
.../perf/jmh/AsyncLoggersLocationBenchmark.java | 2 -
.../jmh/Log4j2AppenderComparisonBenchmark.java | 18 +
.../jmh/MemoryHandlerJULLocationBenchmark.java | 2 -
.../perf/jmh/ThreadsafeDateFormatBenchmark.java | 6 +-
.../logging/log4j/perf/jmh/UnboxBenchmark.java | 91 +
.../main/resources/log4j2-appenderComparison.xml | 6 +
log4j-samples/configuration/pom.xml | 2 +-
log4j-samples/flume-common/pom.xml | 2 +-
log4j-samples/flume-embedded/pom.xml | 2 +-
log4j-samples/flume-remote/pom.xml | 2 +-
log4j-samples/loggerProperties/pom.xml | 2 +-
log4j-samples/pom.xml | 2 +-
log4j-slf4j-impl/pom.xml | 2 +-
log4j-taglib/pom.xml | 2 +-
log4j-to-slf4j/pom.xml | 2 +-
log4j-web/pom.xml | 2 +-
pom.xml | 57 +-
src/changes/announcement.vm | 22 +-
src/changes/changes.xml | 5502 ++++++++++----------
146 files changed, 5200 insertions(+), 3975 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j2.git
More information about the pkg-java-commits
mailing list