[apache-log4j2] 10/15: Update upstream source from tag 'upstream/2.10.0'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Mar 16 16:15:00 GMT 2018


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 0bd2097e512e67cdf6ad37fcdafb219b9d685d2a
Merge: a3d942c d5178ed
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 16 16:42:38 2018 +0100

    Update upstream source from tag 'upstream/2.10.0'
    
    Update to upstream version '2.10.0'
    with Debian dir ad52c50bcc119494a187e9604839fe6880d1e10b

 BUILDING.md                                        |    8 +-
 README.md                                          |   35 +-
 RELEASE-NOTES.md                                   |  304 +--
 doap_log4j2.rdf                                    |    2 +-
 log4j-1.2-api/pom.xml                              |    3 +-
 .../java/org/apache/log4j/AppenderSkeleton.java    |  164 ++
 .../org/apache/log4j/layout/Log4j1XmlLayout.java   |   14 +-
 .../java/org/apache/log4j/spi/OptionHandler.java   |   15 +-
 .../config/Log4j1ConfigurationFactoryTest.java     |   14 +-
 log4j-api-java9/pom.xml                            |    2 +-
 log4j-api-java9/src/assembly/java9.xml             |   12 +
 .../src/main/java/module-info.java                 |   16 +-
 .../main/java/org/apache/logging/log4j/Dummy.java  |    8 +-
 .../org/apache/logging/log4j/message/Dummy.java    |    8 +-
 .../org/apache/logging/log4j/simple/Dummy.java     |    8 +-
 .../org/apache/logging/log4j/spi/Provider.java     |    8 +-
 .../org/apache/logging/log4j/status/Dummy.java     |    8 +-
 .../apache/logging/log4j/util/StackLocator.java    |    8 +-
 .../logging/log4j/util/StackLocatorTest.java       |   50 +-
 log4j-api/pom.xml                                  |    3 +-
 .../java/org/apache/logging/log4j/LogManager.java  |   34 +-
 .../apache/logging/log4j/message/MapMessage.java   |   62 +-
 .../logging/log4j/message/ParameterFormatter.java  |   64 +-
 .../log4j/message/ReusableObjectMessage.java       |   25 +-
 .../log4j/message/StructuredDataMessage.java       |   47 +-
 .../apache/logging/log4j/spi/AbstractLogger.java   |   55 +-
 .../org/apache/logging/log4j/spi/Provider.java     |   32 +
 .../log4j/util/EnvironmentPropertySource.java      |   55 +
 .../org/apache/logging/log4j/util/LoaderUtil.java  |   24 +
 .../apache/logging/log4j/util/LowLevelLogUtil.java |   20 +-
 .../util/MultiFormatStringBuilderFormattable.java  |   41 +
 .../log4j/util/PropertiesPropertySource.java       |   54 +
 .../apache/logging/log4j/util/PropertiesUtil.java  |  188 +-
 .../log4j/util/PropertyFilePropertySource.java     |   52 +
 .../apache/logging/log4j/util/PropertySource.java  |  131 ++
 .../apache/logging/log4j/util/ProviderUtil.java    |   10 +-
 .../apache/logging/log4j/util/StackLocator.java    |    2 +-
 .../apache/logging/log4j/util/StringBuilders.java  |   87 +-
 .../log4j/util/SystemPropertiesPropertySource.java |   96 +-
 .../src/main/resources/Log4j-charsets.properties   |   48 +
 .../org.apache.logging.log4j.util.PropertySource   |   16 +
 .../org/apache/logging/log4j/LogManagerTest.java   |   74 +-
 .../log4j/message/FormattedMessageTest.java        |    2 +-
 .../logging/log4j/message/MapMessageTest.java      |  136 ++
 .../logging/log4j/message/ObjectMapMessage.java    |   10 +-
 .../log4j/message/ParameterizedMessageTest.java    |    6 +-
 .../message/ReusableParameterizedMessageTest.java  |   20 +-
 .../log4j/message/StructuredDataMessageTest.java   |   33 +
 .../logging/log4j/util/CharsetForNameMain.java     |   28 +-
 .../log4j/util/EnvironmentPropertySourceTest.java  |   58 +
 .../util/LegacyPropertiesCompatibilityTest.java    |  103 +
 .../log4j/util/Log4jCharsetsPropertiesTest.java    |   45 +
 .../log4j/util/PropertiesPropertySourceTest.java   |   56 +
 .../logging/log4j/util/PropertiesUtilTest.java     |   16 +-
 .../log4j/util/PropertySourceCamelCaseTest.java    |   54 +
 .../log4j/util/PropertySourceTokenizerTest.java    |   66 +
 .../logging/log4j/util/ProviderUtilTest.java       |   40 +-
 .../logging/log4j/util/SystemPropertiesMain.java   |   95 +-
 {log4j-web => log4j-appserver}/pom.xml             |   39 +-
 .../log4j/appserver/jetty/Log4j2Logger.java        |  220 +++
 .../log4j/appserver/jetty}/package-info.java       |    4 +-
 .../log4j/appserver/tomcat/TomcatLogger.java       |  189 ++
 .../log4j/appserver/tomcat}/package-info.java      |    4 +-
 .../META-INF/services/org.apache.juli.logging.Log  |   17 +-
 log4j-appserver/src/site/markdown/index.md.vm      |   59 +
 {log4j-nosql => log4j-appserver}/src/site/site.xml |    2 +-
 log4j-bom/pom.xml                                  |   22 +-
 {log4j-nosql => log4j-cassandra}/pom.xml           |   24 +-
 .../log4j}/cassandra/CassandraAppender.java        |    2 +-
 .../logging/log4j}/cassandra/CassandraManager.java |    2 +-
 .../log4j}/cassandra/ClockTimestampGenerator.java  |    2 +-
 .../logging/log4j}/cassandra/package-info.java     |    2 +-
 log4j-cassandra/src/site/markdown/index.md.vm      |   24 +
 {log4j-nosql => log4j-cassandra}/src/site/site.xml |    2 +-
 .../log4j}/cassandra/CassandraAppenderIT.java      |    2 +-
 .../logging/log4j}/cassandra/CassandraRule.java    |    2 +-
 .../src/test/resources/CassandraAppenderTest.xml   |    2 +-
 .../src/test/resources/cassandra.yaml              |    0
 log4j-core-its/pom.xml                             |   10 +-
 log4j-core/pom.xml                                 |    7 +-
 .../logging/log4j/core/appender/AsyncAppender.java |   28 +-
 .../log4j/core/appender/ConsoleAppender.java       |   17 +-
 .../core/appender/db/AbstractDatabaseAppender.java |    2 +-
 .../core/appender/db/AbstractDatabaseManager.java  |    2 +-
 .../log4j/core/appender/mom/JmsManager.java        |    1 -
 .../core/appender/mom/kafka/KafkaAppender.java     |   12 +-
 .../core/appender/mom/kafka/KafkaManager.java      |   18 +-
 .../appender/nosql}/AbstractNoSqlConnection.java   |   96 +-
 .../core/appender/nosql}/DefaultNoSqlObject.java   |    4 +-
 .../log4j/core/appender/nosql}/NoSqlAppender.java  |   12 +-
 .../core/appender/nosql}/NoSqlConnection.java      |    2 +-
 .../core/appender/nosql}/NoSqlDatabaseManager.java |    2 +-
 .../log4j/core/appender/nosql}/NoSqlObject.java    |    2 +-
 .../log4j/core/appender/nosql}/NoSqlProvider.java  |    2 +-
 .../log4j/core/appender/nosql}/package-info.java   |    8 +-
 .../logging/log4j/core/async/AsyncLogger.java      |   69 +-
 .../log4j/core/async/AsyncLoggerConfig.java        |   14 +
 .../core/async/AsyncLoggerConfigDisruptor.java     |   32 +-
 .../log4j/core/async/AsyncLoggerDisruptor.java     |    4 +-
 .../core/async/AsyncQueueFullMessageUtil.java      |   45 +
 .../core/async/DefaultAsyncQueueFullPolicy.java    |   14 +-
 .../log4j/core/async/InternalAsyncUtil.java        |   50 +
 .../log4j/core/async/RingBufferLogEvent.java       |   12 +-
 .../core/async/ThreadNameCachingStrategy.java      |   17 +-
 .../config/composite/CompositeConfiguration.java   |   15 +-
 .../config/composite/DefaultMergeStrategy.java     |  547 +++---
 .../config/plugins/convert/Base64Converter.java    |    4 +-
 .../core/config/plugins/util/ResolverUtil.java     |    1 -
 .../log4j/core/config/xml/XmlConfiguration.java    |   18 +-
 .../log4j/core/impl/Log4jContextFactory.java       |   10 +-
 .../logging/log4j/core/impl/MutableLogEvent.java   |   14 +-
 .../logging/log4j/core/jackson/LevelMixIn.java     |    4 +-
 .../log4j/core/layout/AbstractJacksonLayout.java   |  135 +-
 .../log4j/core/layout/CsvParameterLayout.java      |    2 +-
 .../logging/log4j/core/layout/JsonLayout.java      |   42 +-
 .../logging/log4j/core/layout/PatternLayout.java   |   16 +-
 .../logging/log4j/core/layout/XmlLayout.java       |   22 +-
 .../logging/log4j/core/layout/YamlLayout.java      |   30 +-
 .../logging/log4j/core/lookup/Interpolator.java    |    3 +-
 .../logging/log4j/core/net/TcpSocketManager.java   |    3 -
 .../net/ssl/AbstractKeyStoreConfiguration.java     |   33 +-
 .../core/net/ssl/EnvironmentPasswordProvider.java  |   55 +
 .../log4j/core/net/ssl/FilePasswordProvider.java   |   83 +
 .../log4j/core/net/ssl/KeyStoreConfiguration.java  |   94 +-
 .../log4j/core/net/ssl/MemoryPasswordProvider.java |   52 +
 .../log4j/core/net/ssl/PasswordProvider.java       |   41 +
 .../log4j/core/net/ssl/StoreConfiguration.java     |   43 +-
 .../core/net/ssl/TrustStoreConfiguration.java      |   80 +-
 .../core/pattern/EncodingPatternConverter.java     |   38 +-
 .../core/pattern/MessagePatternConverter.java      |   11 +-
 .../logging/log4j/core/pattern/PatternParser.java  |   43 +-
 .../core/pattern/ProcessIdPatternConverter.java    |    4 -
 .../log4j/core/tools/picocli/CommandLine.java      | 1773 ++++++++++++-----
 .../apache/logging/log4j/core/util/Constants.java  |    9 +
 log4j-core/src/main/resources/Log4j-config.xsd     |    2 +-
 .../log4j/core/PropertiesFileConfigTest.java       |    6 +-
 .../appender/ConsoleAppenderAnsiMessagesMain.java  |    3 +-
 .../ConsoleAppenderAnsiStyleJira180Main.java       |    3 +-
 .../ConsoleAppenderAnsiStyleJira272Main.java       |    1 +
 .../ConsoleAppenderAnsiStyleJira319Main.java       |    3 +-
 .../ConsoleAppenderAnsiStyleLayoutMain.java        |    3 +-
 .../ConsoleAppenderAnsiStyleNameLayoutMain.java    |    1 +
 .../ConsoleAppenderHighlightLayoutDefaultMain.java |    1 +
 .../ConsoleAppenderHighlightLayoutMain.java        |    1 +
 .../appender/ConsoleAppenderJAnsiMessageMain.java  |    7 +-
 .../ConsoleAppenderJAnsiXExceptionMain.java        |    7 +-
 .../ConsoleAppenderNoAnsiStyleLayoutMain.java      |    2 +-
 .../CsvJsonParameterLayoutFileAppenderTest.java    |    9 +-
 .../log4j/core/appender/HttpAppenderTest.java      |    7 +-
 .../SecureSocketAppenderSocketOptionsTest.java     |   21 +-
 .../log4j/core/appender/SmtpAppenderTest.java      |    1 -
 .../log4j/core/appender/SocketAppenderTest.java    |   10 +
 .../log4j/core/appender/TlsSyslogAppenderTest.java |    4 +-
 .../appender/db/AbstractDatabaseManagerTest.java   |   50 +-
 .../appender/db/jpa/AbstractJpaAppenderTest.java   |    8 +-
 .../core/appender/mom/kafka/KafkaAppenderTest.java |   36 +
 .../core/appender/nosql}/NoSqlAppenderTest.java    |    2 +-
 .../appender/nosql}/NoSqlDatabaseManagerTest.java  |    2 +-
 ...RollingAppenderDirectWriteWithFilenameTest.java |    1 -
 .../async/AbstractAsyncThreadContextTestBase.java  |    2 +
 .../log4j/core/async/AsyncLoggerConfigTest3.java   |   72 +
 .../async/AsyncLoggerThreadNameStrategyTest.java   |   24 +-
 .../async/AsyncQueueFullPolicyFactoryTest.java     |   14 +-
 .../logging/log4j/core/async/BlockingAppender.java |   94 +
 .../async/DefaultAsyncQueueFullPolicyTest.java     |    6 +-
 .../async/DiscardingAsyncQueueFullPolicyTest.java  |    8 +-
 .../log4j/core/async/QueueFullAbstractTest.java    |  128 ++
 .../core/async/QueueFullAsyncAppenderTest.java     |   93 +
 .../core/async/QueueFullAsyncAppenderTest2.java    |   70 +
 ...llAsyncLoggerConfigLoggingFromToStringTest.java |  103 +
 ...lAsyncLoggerConfigLoggingFromToStringTest2.java |   73 +
 .../core/async/QueueFullAsyncLoggerConfigTest.java |   94 +
 .../async/QueueFullAsyncLoggerConfigTest2.java     |   71 +
 ...ueueFullAsyncLoggerLoggingFromToStringTest.java |  108 ++
 ...eueFullAsyncLoggerLoggingFromToStringTest2.java |  108 ++
 .../log4j/core/async/QueueFullAsyncLoggerTest.java |  102 +
 .../core/async/QueueFullAsyncLoggerTest2.java      |   83 +
 .../logging/log4j/core/layout/JsonLayoutTest.java  |   22 +
 .../logging/log4j/core/layout/XmlLayoutTest.java   |   19 +
 .../logging/log4j/core/layout/YamlLayoutTest.java  |   19 +
 .../log4j/core/net/mock/MockTcpSyslogServer.java   |   23 +-
 .../log4j/core/net/mock/MockUdpSyslogServer.java   |    7 +
 .../net/ssl/EnvironmentPasswordProviderTest.java   |   25 +-
 .../core/net/ssl/FilePasswordProviderTest.java     |   50 +
 .../core/net/ssl/KeyStoreConfigurationTest.java    |   37 +-
 .../core/net/ssl/MemoryPasswordProviderTest.java   |   49 +
 .../log4j/core/net/ssl/SslConfigurationTest.java   |   42 +-
 .../log4j/core/net/ssl/StoreConfigurationTest.java |   27 +-
 .../logging/log4j/core/net/ssl/TestConstants.java  |   10 +-
 .../core/net/ssl/TrustStoreConfigurationTest.java  |   36 +-
 .../core/pattern/EncodingPatternConverterTest.java |   43 +-
 .../core/pattern/MessagePatternConverterTest.java  |   99 +
 .../log4j/core/pattern/PatternParserTest.java      |   45 +-
 .../log4j/core/pattern/StyleConverterTest.java     |    6 +
 .../core/tools/picocli/CommandLineArityTest.java   |  934 +++++++++
 .../core/tools/picocli/CommandLineHelpTest.java    | 1006 +++++++++-
 .../log4j/core/tools/picocli/CommandLineTest.java  | 2048 +++++++++++---------
 .../log4j/core/tools/picocli/CustomLayoutDemo.java |    8 +-
 .../logging/log4j/core/tools/picocli/Demo.java     |   82 +-
 .../logging/log4j/core/util/ClockFactoryTest.java  |   12 +-
 .../core/util/ShutdownCallbackRegistryTest.java    |    8 +
 .../src/test/resources/AsyncLoggerConfigTest2.xml  |   12 +-
 .../src/test/resources/KafkaAppenderTest.xml       |   11 +
 log4j-core/src/test/resources/log4j2-queueFull.xml |   28 +
 .../resources/log4j2-queueFullAsyncAppender.xml    |   31 +
 .../log4j2-queueFullAsyncLoggerConfig.xml          |   28 +
 {log4j-nosql => log4j-couchdb}/pom.xml             |   41 +-
 .../logging/log4j}/couchdb/CouchDbConnection.java  |  138 +-
 .../logging/log4j}/couchdb/CouchDbProvider.java    |    4 +-
 .../logging/log4j}/couchdb/package-info.java       |    2 +-
 .../src/site/markdown/index.md.vm                  |   35 +-
 {log4j-nosql => log4j-couchdb}/src/site/site.xml   |    2 +-
 log4j-distribution/pom.xml                         |   61 +-
 log4j-flume-ng/pom.xml                             |    3 +-
 log4j-iostreams/pom.xml                            |    3 +-
 log4j-jcl/pom.xml                                  |    3 +-
 log4j-jmx-gui/pom.xml                              |    3 +-
 log4j-jul/pom.xml                                  |    3 +-
 log4j-liquibase/pom.xml                            |   23 +-
 {log4j-nosql => log4j-mongodb}/pom.xml             |   41 +-
 .../logging/log4j}/mongodb/MongoDbConnection.java  |    8 +-
 .../logging/log4j}/mongodb/MongoDbObject.java      |    4 +-
 .../logging/log4j}/mongodb/MongoDbProvider.java    |    4 +-
 .../logging/log4j}/mongodb/package-info.java       |    2 +-
 .../src/site/markdown/index.md.vm                  |   35 +-
 {log4j-nosql => log4j-mongodb}/src/site/site.xml   |    2 +-
 .../logging/log4j/mongodb}/MongoDbAuthTest.java    |   80 +-
 .../logging/log4j/mongodb}/MongoDbCappedTest.java  |    2 +-
 .../apache/logging/log4j/mongodb}/MongoDbTest.java |   80 +-
 .../src/test/resources/log4j2-mongodb-auth.xml     |    0
 .../src/test/resources/log4j2-mongodb-capped.xml   |    0
 .../src/test/resources/log4j2-mongodb.xml          |    0
 .../logging/log4j/nosql/appender/package-info.java |   34 -
 log4j-osgi/pom.xml                                 |    3 +-
 log4j-perf/pom.xml                                 |    2 +-
 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                           |   52 +-
 .../apache/logging/slf4j/SLF4JServiceProvider.java |   57 +
 .../services/org.slf4j.spi.SLF4JServiceProvider    |    1 +
 log4j-taglib/pom.xml                               |    7 +-
 log4j-to-slf4j/pom.xml                             |    3 +-
 log4j-web/pom.xml                                  |    3 +-
 ...ShutdownPropertyTest.java => PropertyTest.java} |   16 +-
 pom.xml                                            |  124 +-
 src/changes/announcement.vm                        |   20 +-
 src/changes/changes.xml                            |  184 +-
 251 files changed, 11072 insertions(+), 3238 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