[apache-log4j2] 02/15: Merge tag 'upstream/2.4.1'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jul 8 14:22:04 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 dfbffc86759e36bb9fd49c906a3ffff6e5f8f40b
Merge: 7421690 682c51a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jul 8 15:01:20 2016 +0200
Merge tag 'upstream/2.4.1'
Upstream version 2.4.1
RELEASE-NOTES.txt | 118 +---
checkstyle.xml | 7 +
log4j-1.2-api/pom.xml | 2 +-
log4j-api/pom.xml | 2 +-
.../java/org/apache/logging/log4j/EventLogger.java | 4 +-
.../main/java/org/apache/logging/log4j/Level.java | 82 +--
.../java/org/apache/logging/log4j/LogManager.java | 205 ++++---
.../main/java/org/apache/logging/log4j/Logger.java | 227 +++----
.../main/java/org/apache/logging/log4j/Marker.java | 40 +-
.../org/apache/logging/log4j/MarkerManager.java | 37 +-
.../org/apache/logging/log4j/ThreadContext.java | 143 +++--
.../logging/log4j/message/FormattedMessage.java | 4 +-
.../logging/log4j/message/LocalizedMessage.java | 21 +-
.../logging/log4j/message/ObjectMessage.java | 8 +-
.../log4j/message/ParameterizedMessageFactory.java | 5 +-
.../message/StringFormatterMessageFactory.java | 4 +-
.../logging/log4j/message/StructuredDataId.java | 39 +-
.../apache/logging/log4j/simple/SimpleLogger.java | 20 +-
.../logging/log4j/simple/SimpleLoggerContext.java | 2 +-
.../log4j/simple/SimpleLoggerContextFactory.java | 6 +-
.../apache/logging/log4j/spi/AbstractLogger.java | 75 ++-
.../logging/log4j/spi/AbstractLoggerAdapter.java | 14 +-
.../logging/log4j/spi/DefaultThreadContextMap.java | 22 +-
.../log4j/spi/DefaultThreadContextStack.java | 70 +--
.../logging/log4j/spi/ExtendedLoggerWrapper.java | 26 +-
.../org/apache/logging/log4j/spi/Provider.java | 5 +-
.../apache/logging/log4j/spi/StandardLevel.java | 10 +-
.../apache/logging/log4j/status/StatusData.java | 14 +-
.../apache/logging/log4j/status/StatusLogger.java | 41 +-
.../java/org/apache/logging/log4j/util/Chars.java | 17 +-
.../apache/logging/log4j/util/EnglishEnums.java | 6 +-
.../org/apache/logging/log4j/util/LambdaUtil.java | 2 +-
.../org/apache/logging/log4j/util/LoaderUtil.java | 53 +-
.../apache/logging/log4j/util/PropertiesUtil.java | 80 ++-
.../apache/logging/log4j/util/ProviderUtil.java | 36 +-
.../apache/logging/log4j/util/ReflectionUtil.java | 58 +-
.../apache/logging/log4j/util/StringBuilders.java | 25 +-
.../org/apache/logging/log4j/util/Strings.java | 29 +-
log4j-bom/pom.xml | 4 +-
log4j-core/pom.xml | 2 +-
.../java/org/apache/logging/log4j/core/Logger.java | 96 +--
.../apache/logging/log4j/core/LoggerContext.java | 254 ++++----
.../log4j/core/appender/AbstractAppender.java | 47 +-
.../appender/AbstractOutputStreamAppender.java | 27 +-
.../logging/log4j/core/appender/AsyncAppender.java | 72 +--
.../log4j/core/appender/ConsoleAppender.java | 68 +--
.../core/appender/MemoryMappedFileManager.java | 17 +-
.../core/appender/RandomAccessFileManager.java | 4 +-
.../log4j/core/appender/RollingFileAppender.java | 3 +-
.../core/appender/mom/jeromq/JeroMqAppender.java | 154 ++---
.../util => appender/mom/jeromq}/package-info.java | 12 +-
.../util => appender/mom/kafka}/package-info.java | 12 +-
.../appender/rolling/DefaultRolloverStrategy.java | 56 +-
.../core/appender/rolling/RollingFileManager.java | 3 +-
.../rolling/RollingRandomAccessFileManager.java | 33 +-
.../rolling/SizeBasedTriggeringPolicy.java | 6 +-
.../rolling/TimeBasedTriggeringPolicy.java | 10 +-
.../rolling/action/CommonsCompressAction.java | 14 +-
.../appender/rolling/action/ZipCompressAction.java | 21 +-
.../logging/log4j/core/async/AsyncLogger.java | 137 +++--
.../log4j/core/async/AsyncLoggerConfig.java | 5 +-
.../log4j/core/async/AsyncLoggerConfigHelper.java | 117 ++--
.../log4j/core/async/DaemonThreadFactory.java | 6 +-
.../log4j/core/async/RingBufferLogEvent.java | 10 +-
.../log4j/core/config/AbstractConfiguration.java | 247 ++++----
.../logging/log4j/core/config/AppenderControl.java | 16 +-
.../config/AwaitCompletionReliabilityStrategy.java | 35 +-
.../AwaitUnconditionallyReliabilityStrategy.java | 10 +-
.../log4j/core/config/DefaultAdvertiser.java | 2 +-
.../core/config/DefaultConfigurationMonitor.java | 8 +-
.../core/config/DefaultReliabilityStrategy.java | 8 +-
.../core/config/LockingReliabilityStrategy.java | 35 +-
.../logging/log4j/core/config/LoggerConfig.java | 8 +-
.../log4j/core/config/NullConfiguration.java | 5 +-
.../log4j/core/config/ReliabilityStrategy.java | 17 +-
.../core/config/ReliabilityStrategyFactory.java | 2 +-
.../builder/impl/DefaultConfigurationBuilder.java | 3 +-
.../log4j/core/config/json/JsonConfiguration.java | 5 +-
.../config/plugins/processor/PluginProcessor.java | 35 +-
.../config/plugins/processor/package-info.java | 2 +-
.../core/config/plugins/util/PluginBuilder.java | 1 -
.../core/config/plugins/util/ResolverUtil.java | 6 +-
.../core/config/plugins/util/package-info.java | 2 +-
.../validation/validators/RequiredValidator.java | 4 +-
.../plugins/visitors/AbstractPluginVisitor.java | 39 +-
.../config/plugins/visitors/PluginNodeVisitor.java | 2 +-
.../core/config/plugins/visitors/package-info.java | 2 +-
.../properties/PropertiesConfigurationFactory.java | 38 +-
.../log4j/core/config/xml/XmlConfiguration.java | 181 +++---
.../logging/log4j/core/impl/Log4jLogEvent.java | 5 +-
.../core/jackson/ListOfMapEntrySerializer.java | 9 +-
.../log4j/core/jackson/MessageSerializer.java | 2 +
.../log4j/core/layout/AbstractCsvLayout.java | 51 +-
.../log4j/core/layout/AbstractJacksonLayout.java | 3 +-
.../logging/log4j/core/layout/AbstractLayout.java | 4 +-
.../log4j/core/layout/AbstractStringLayout.java | 152 ++++-
.../log4j/core/layout/CsvLogEventLayout.java | 16 +-
.../log4j/core/layout/CsvParameterLayout.java | 13 +-
.../logging/log4j/core/layout/GelfLayout.java | 34 +-
.../logging/log4j/core/layout/HtmlLayout.java | 29 +-
.../log4j/core/layout/MarkerPatternSelector.java | 125 ++++
.../logging/log4j/core/layout/PatternLayout.java | 122 ++--
.../KeyValuePair.java => layout/PatternMatch.java} | 67 +--
.../PatternSelector.java} | 22 +-
.../logging/log4j/core/layout/Rfc5424Layout.java | 87 +--
.../logging/log4j/core/layout/SyslogLayout.java | 6 +-
.../logging/log4j/core/layout/XmlLayout.java | 3 +
.../logging/log4j/core/lookup/AbstractLookup.java | 2 +-
.../logging/log4j/core/lookup/Log4jLookup.java | 36 +-
.../logging/log4j/core/lookup/MainMapLookup.java | 22 +-
.../logging/log4j/core/lookup/MapLookup.java | 44 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 99 ++-
.../core/net/server/InputStreamLogEventBridge.java | 2 +-
.../log4j/core/pattern/DatePatternConverter.java | 66 +-
.../EqualsIgnoreCaseReplacementConverter.java | 101 ++++
.../core/pattern/EqualsReplacementConverter.java | 101 ++++
.../logging/log4j/core/pattern/FormattingInfo.java | 2 +
.../core/pattern/LiteralPatternConverter.java | 12 +
.../core/pattern/LogEventPatternConverter.java | 4 +
.../log4j/core/pattern/MapPatternConverter.java | 4 +-
.../log4j/core/pattern/MarkerPatternConverter.java | 2 +-
....java => MarkerSimpleNamePatternConverter.java} | 18 +-
.../log4j/core/pattern/MdcPatternConverter.java | 6 +-
.../VariablesNotEmptyReplacementConverter.java | 91 +++
.../apache/logging/log4j/core/util/FileUtils.java | 17 +-
.../apache/logging/log4j/core/util/Integers.java | 24 +-
.../apache/logging/log4j/core/util/JndiCloser.java | 5 +-
.../logging/log4j/core/util/KeyValuePair.java | 8 +-
.../org/apache/logging/log4j/core/util/Loader.java | 6 +-
.../logging/log4j/core/util/NanoClockFactory.java | 8 +-
.../apache/logging/log4j/core/util/NetUtils.java | 10 +-
.../logging/log4j/core/util/NullOutputStream.java | 2 +-
.../apache/logging/log4j/core/util/Patterns.java | 5 +-
.../logging/log4j/core/util/ReflectionUtil.java | 2 +
.../apache/logging/log4j/core/util/SetUtils.java | 9 +-
.../apache/logging/log4j/core/util/Throwables.java | 36 +-
.../apache/logging/log4j/core/util/UuidUtil.java | 23 +-
.../log4j/core/util/datetime/DateParser.java | 34 +-
.../log4j/core/util/datetime/DatePrinter.java | 2 +-
.../log4j/core/util/datetime/FastDateFormat.java | 471 ++++++++-------
.../log4j/core/util/datetime/FastDateParser.java | 488 ++++++++-------
.../log4j/core/util/datetime/FastDatePrinter.java | 346 ++++++-----
.../log4j/core/util/datetime/FixedDateFormat.java | 72 ++-
.../log4j/core/util/datetime/FormatCache.java | 163 ++---
.../util => util/datetime}/package-info.java | 11 +-
log4j-core/src/site/xdoc/index.xml | 14 +-
.../org/apache/logging/log4j/MarkerMixInTest.java | 2 +-
.../logging/log4j/core/PatternSelectorTest.java | 55 ++
.../AsyncAppenderShutdownTimeoutTest.java} | 33 +-
.../log4j/core/appender/ConsoleAppenderTest.java | 2 +-
.../log4j/core/appender/HangingAppender.java | 62 ++
.../appender/rolling/RollingAppenderSizeTest.java | 63 +-
...ingRandomAccessFileManagerHeaderFooterTest.java | 2 +-
.../PropertiesConfigurationRootLoggerOnlyTest.java | 60 ++
.../logging/log4j/core/jackson/LevelMixInTest.java | 4 +-
.../log4j/core/layout/PatternLayoutTest.java | 54 +-
.../log4j/core/layout/PatternSelectorTest.java | 65 ++
.../logging/log4j/core/lookup/Log4jLookupTest.java | 21 +-
.../core/lookup/Log4jLookupWithSpacesTest.java | 36 +-
.../core/pattern/DatePatternConverterTest.java | 64 +-
.../EqualsIgnoreCaseReplacementConverterTest.java | 63 ++
.../pattern/EqualsReplacementConverterTest.java | 63 ++
.../core/pattern/MarkerPatternConverterTest.java | 3 +-
...a => MarkerSimpleNamePatternConverterTest.java} | 13 +-
.../VariablesNotEmptyReplacementConverterTest.java | 78 +++
.../core/tools/GenerateExtendedLoggerTest.java | 29 +-
.../logging/log4j/core/util/ThrowablesTest.java | 19 +
.../log4j/test/appender/DeadlockAppender.java | 2 +
.../logging/log4j/test/layout/BasicLayout.java | 9 +-
.../resources/log4j-asynch-shutdownTimeout.xml | 37 ++
.../src/test/resources/log4j-patternSelector.xml | 33 +
.../log4j2-properties-root-only.properties | 38 ++
log4j-distribution/pom.xml | 2 +-
log4j-flume-ng/pom.xml | 2 +-
.../flume/appender/FlumePersistentManager.java | 3 +-
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 +-
.../nosql/appender/AbstractNoSqlConnection.java | 87 +--
.../nosql/appender/couchdb/CouchDbConnection.java | 145 +++--
.../nosql/appender/mongodb/MongoDbConnection.java | 216 +++----
.../nosql/appender/mongodb/MongoDbProvider.java | 85 +--
.../log4j/nosql/appender/MongoDbAuthTest.java | 74 +--
.../src/test/resources/log4j2-mongodb-auth.xml | 30 +
log4j-perf/pom.xml | 2 +-
.../log4j/perf/jmh/PatternLayoutBenchmark.java | 16 +-
.../perf/jmh/PatternLayoutComparisonBenchmark.java | 2 +-
.../log4j/perf/jmh/StringEncodingBenchmark.java | 242 +++++++-
.../log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java | 216 +++++++
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 +-
.../apache/logging/log4j/taglib/DumpTagTest.java | 243 ++++----
log4j-to-slf4j/pom.xml | 2 +-
.../logging/slf4j/CallerInformationTest.java | 130 ++--
...alLoggerContext.java => LoggerContextRule.java} | 143 ++---
.../java/org/apache/logging/slf4j/LoggerTest.java | 318 +++++-----
log4j-web/pom.xml | 2 +-
pom.xml | 18 +-
src/changes/announcement.vm | 4 +-
src/changes/changes.xml | 73 ++-
src/site/custom/project-info-report.properties | 666 ++++++++++-----------
src/site/pdf.xml | 114 ++--
src/site/resources/js/bootstrap.min.js | 6 -
src/site/resources/js/jquery.min.js | 4 -
src/site/resources/js/prettify.min.js | 41 --
src/site/site.xml | 8 +-
src/site/xdoc/articles.xml | 16 +
src/site/xdoc/changelog.xml | 87 ++-
src/site/xdoc/faq.xml | 474 +++++++--------
src/site/xdoc/manual/appenders.xml | 36 +-
src/site/xdoc/manual/customconfig.xml | 24 +-
src/site/xdoc/manual/layouts.xml.vm | 214 ++++---
src/site/xdoc/manual/plugins.xml | 456 +++++++-------
222 files changed, 6955 insertions(+), 4764 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