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 46b6cf9331ad9f75120010360da3a04478a9c306 Merge: 1cda817 2d92309 Author: Emmanuel Bourg <[email protected]> Date: Fri Mar 16 14:46:01 2018 +0100 Update upstream source from tag 'upstream/2.9.0' Update to upstream version '2.9.0' with Debian dir d2d916cc0a58a50e496b4f98992b5206640ebf38 .gitignore | 2 + .mvn/wrapper/maven-wrapper.jar | Bin 49519 -> 0 bytes .mvn/wrapper/maven-wrapper.properties | 16 - .travis-toolchains.xml | 53 + .travis.yml | 17 +- BUILDING.md | 21 +- Dockerfile | 21 +- NOTICE.txt | 3 + README.md | 2 + RELEASE-NOTES.md | 270 +- jenkins-toolchains.xml | 52 + log4j-1.2-api/pom.xml | 8 +- .../log4j/config/Log4j1ConfigurationConverter.java | 39 +- .../AbstractLog4j1ConfigurationConverterTest.java | 1 - log4j-api-java9/pom.xml | 153 + log4j-api-java9/src/assembly/java9.xml | 36 + .../apache/logging/log4j/util/ProcessIdUtil.java | 20 +- .../apache/logging/log4j/util/StackLocator.java | 78 + .../logging/log4j/util/ProcessIdUtilTest.java | 19 +- .../logging/log4j/util/StackLocatorTest.java | 67 +- log4j-api-scala_2.10/pom.xml | 157 - .../org/apache/logging/log4j/scala/Logger.scala | 592 --- .../apache/logging/log4j/scala/LoggerMacro.scala | 425 --- .../apache/logging/log4j/scala/LoggerTest.scala | 552 --- log4j-api-scala_2.11/pom.xml | 157 - .../org/apache/logging/log4j/scala/Logger.scala | 592 --- .../apache/logging/log4j/scala/LoggerMacro.scala | 425 --- .../apache/logging/log4j/scala/LoggerTest.scala | 552 --- log4j-api/pom.xml | 93 +- .../main/java/org/apache/logging/log4j/Level.java | 18 +- .../java/org/apache/logging/log4j/LogManager.java | 38 +- .../logging/log4j/message/FormattedMessage.java | 4 +- .../log4j/message/LocalizedMessageFactory.java | 2 +- .../apache/logging/log4j/message/MapMessage.java | 381 +- .../log4j/message/MessageCollectionMessage.java | 16 +- .../log4j/message/ParameterizedMessage.java | 3 + .../message/ReusableParameterizedMessage.java | 8 +- .../logging/log4j/message/SimpleMessage.java | 11 +- .../logging/log4j/message/StringMapMessage.java | 71 + .../message/StructuredDataCollectionMessage.java | 101 + .../logging/log4j/message/StructuredDataId.java | 65 +- .../log4j/message/StructuredDataMessage.java | 192 +- .../logging/log4j/message/ThreadDumpMessage.java | 75 +- .../logging/log4j/message/ThreadInformation.java | 2 +- .../apache/logging/log4j/spi/AbstractLogger.java | 45 +- .../org/apache/logging/log4j/spi/Provider.java | 73 +- .../apache/logging/log4j/status/StatusLogger.java | 32 +- .../org/apache/logging/log4j/util/Activator.java | 30 +- .../org/apache/logging/log4j/util/Constants.java | 26 + .../org/apache/logging/log4j/util/LoaderUtil.java | 2 +- .../apache/logging/log4j/util/ProcessIdUtil.java | 31 +- .../apache/logging/log4j/util/PropertiesUtil.java | 34 +- .../apache/logging/log4j/util/ProviderUtil.java | 16 + .../logging/log4j/util/SortedArrayStringMap.java | 30 +- .../{ReflectionUtil.java => StackLocator.java} | 254 +- .../logging/log4j/util/StackLocatorUtil.java | 73 + .../apache/logging/log4j/util/StringBuilders.java | 15 + .../org/apache/logging/log4j/TestProvider.java | 18 +- .../log4j/ThreadContextInheritanceTest.java | 74 +- .../apache/logging/log4j/ThreadContextTest.java | 68 +- .../logging/log4j/ThreadContextUtilityClass.java | 116 + .../test/java/org/apache/logging/log4j/Timer.java | 25 +- .../log4j/message/FormattedMessageTest.java | 28 +- .../logging/log4j/message/MapMessageTest.java | 12 +- .../log4j/message/MessageFormatMessageTest.java | 5 +- .../log4j/message/ThreadDumpMessageTest.java | 4 +- .../apache/logging/log4j/util/ClassLocator.java | 15 +- .../logging/log4j/util/ClassNameLocator.java | 13 +- .../logging/log4j/util/ProcessIdUtilTest.java | 20 +- .../logging/log4j/util/PropertiesUtilTest.java | 10 +- ...tionUtilTest.java => StackLocatorUtilTest.java} | 50 +- .../logging/log4j/util/StringBuildersTest.java | 51 + .../resources/META-INF/log4j-provider.properties | 3 - .../services/org.apache.logging.log4j.spi.Provider | 1 + log4j-bom/pom.xml | 16 +- log4j-core-its/pom.xml | 66 +- .../apache/logging/log4j/core/SimplePerfTest.java | 6 +- .../logging/log4j/core/ThreadedPerfTest.java | 2 +- .../core/appender/mom/activemq/JmsAppenderIT.java | 144 - log4j-core-its/src/test/resources/logback-test.xml | 29 + log4j-core/pom.xml | 38 +- .../log4j/core/DefaultLoggerContextAccessor.java | 26 +- .../org/apache/logging/log4j/core/LifeCycle2.java | 3 + .../org/apache/logging/log4j/core/LogEvent.java | 2 - .../logging/log4j/core/LoggerContextAccessor.java | 16 +- .../log4j/core/appender/AbstractFileAppender.java | 196 + .../log4j/core/appender/AbstractManager.java | 25 +- .../log4j/core/appender/ConsoleAppender.java | 18 +- .../logging/log4j/core/appender/FileAppender.java | 38 +- .../logging/log4j/core/appender/FileManager.java | 157 +- .../logging/log4j/core/appender/HttpAppender.java | 192 + .../logging/log4j/core/appender/HttpManager.java} | 84 +- .../core/appender/HttpURLConnectionManager.java | 139 + .../core/appender/MemoryMappedFileManager.java | 4 +- .../log4j/core/appender/OutputStreamManager.java | 712 ++-- .../core/appender/RandomAccessFileManager.java | 4 +- .../log4j/core/appender/RollingFileAppender.java | 52 +- .../appender/RollingRandomAccessFileAppender.java | 52 +- .../log4j/core/appender/SocketAppender.java | 21 +- .../log4j/core/appender/mom/JmsAppender.java | 228 +- .../log4j/core/appender/mom/JmsManager.java | 669 +++- .../core/appender/mom/kafka/KafkaAppender.java | 79 +- .../core/appender/mom/kafka/KafkaManager.java | 9 +- .../core/appender/rewrite/MapRewritePolicy.java | 16 +- .../appender/rolling/AbstractRolloverStrategy.java | 32 +- .../appender/rolling/AbstractTriggeringPolicy.java | 2 +- .../appender/rolling/CronTriggeringPolicy.java | 2 - .../appender/rolling/DefaultRolloverStrategy.java | 327 +- .../rolling/DirectWriteRolloverStrategy.java | 248 +- .../core/appender/rolling/PatternProcessor.java | 16 +- .../core/appender/rolling/RollingFileManager.java | 120 +- .../rolling/RollingRandomAccessFileManager.java | 130 +- .../rolling/TimeBasedTriggeringPolicy.java | 78 +- .../rolling/action/AbstractPathAction.java | 326 +- .../rolling/action/CommonsCompressAction.java | 8 +- .../core/appender/rolling/action/DeleteAction.java | 2 +- .../appender/rolling/action/FileRenameAction.java | 5 +- .../appender/rolling/action/GzCompressAction.java | 4 +- .../rolling/action/IfAccumulatedFileCount.java | 2 +- .../rolling/action/IfAccumulatedFileSize.java | 2 +- .../log4j/core/appender/rolling/action/IfAll.java | 2 +- .../log4j/core/appender/rolling/action/IfAny.java | 2 +- .../core/appender/rolling/action/IfFileName.java | 6 +- .../appender/rolling/action/IfLastModified.java | 4 +- .../log4j/core/appender/rolling/action/IfNot.java | 2 +- .../rolling/action/PathSortByModificationTime.java | 2 +- .../rolling/action/PosixViewAttributeAction.java | 307 ++ .../appender/rolling/action/ZipCompressAction.java | 4 +- .../logging/log4j/core/async/AsyncLogger.java | 4 +- .../core/async/AsyncLoggerConfigDisruptor.java | 41 +- .../log4j/core/async/AsyncLoggerDisruptor.java | 41 +- .../log4j/core/async/RingBufferLogEvent.java | 22 +- .../core/async/RingBufferLogEventTranslator.java | 2 +- .../log4j/core/config/AbstractConfiguration.java | 12 +- .../log4j/core/config/AppenderControlArraySet.java | 5 + .../log4j/core/config/ConfigurationFactory.java | 95 +- .../log4j/core/config/ConfigurationScheduler.java | 61 +- .../log4j/core/config/ConfigurationSource.java | 76 + .../logging/log4j/core/config/LoggersPlugin.java | 3 + .../core/config/builder/api/ComponentBuilder.java | 4 +- .../config/builder/api/ConfigurationBuilder.java | 15 + .../builder/api/KeyValuePairComponentBuilder.java} | 15 +- .../builder/api/PropertyComponentBuilder.java} | 15 +- .../builder/impl/DefaultConfigurationBuilder.java | 11 + .../impl/DefaultKeyValuePairComponentBuilder.java} | 22 +- .../impl/DefaultPropertyComponentBuilder.java} | 20 +- .../config/composite/CompositeConfiguration.java | 2 +- .../core/config/json/JsonConfigurationFactory.java | 5 +- .../config/plugins/convert/Base64Converter.java | 79 + .../plugins/convert/HexConverter.java} | 22 +- .../config/plugins/convert/TypeConverters.java | 5 +- .../config/plugins/processor/PluginProcessor.java | 8 + .../core/config/plugins/util/PluginBuilder.java | 13 +- .../core/config/plugins/util/ResolverUtil.java | 22 +- .../validation/validators/ValidHostValidator.java | 4 +- .../validation/validators/ValidPortValidator.java | 2 +- .../properties/PropertiesConfigurationBuilder.java | 6 +- .../log4j/core/config/xml/XmlConfiguration.java | 11 + .../core/config/yaml/YamlConfigurationFactory.java | 2 +- .../logging/log4j/core/filter/MapFilter.java | 6 +- .../log4j/core/filter/StructuredDataFilter.java | 5 +- .../logging/log4j/core/impl/Log4jLogEvent.java | 25 +- .../NotANumber.java => impl/Log4jProvider.java} | 18 +- .../logging/log4j/core/impl/MutableLogEvent.java | 24 +- .../logging/log4j/core/impl/ThrowableProxy.java | 14 +- .../logging/log4j/core/jackson/Initializers.java | 8 +- .../log4j/core/jackson/Log4jJsonModule.java | 8 +- .../log4j/core/jackson/Log4jJsonObjectMapper.java | 6 +- .../logging/log4j/core/jackson/Log4jXmlModule.java | 6 +- .../log4j/core/jackson/Log4jXmlObjectMapper.java | 6 +- .../log4j/core/jackson/Log4jYamlModule.java | 8 +- .../log4j/core/jackson/Log4jYamlObjectMapper.java | 6 +- .../ThrowableProxyWithStacktraceAsStringMixIn.java | 78 + .../log4j/core/layout/AbstractJacksonLayout.java | 92 + .../logging/log4j/core/layout/AbstractLayout.java | 27 +- .../log4j/core/layout/AbstractStringLayout.java | 20 +- .../log4j/core/layout/ByteBufferDestination.java | 27 + .../core/layout/ByteBufferDestinationHelper.java | 73 + .../logging/log4j/core/layout/GelfLayout.java | 63 +- .../logging/log4j/core/layout/JacksonFactory.java | 20 +- .../logging/log4j/core/layout/JsonLayout.java | 862 +---- .../core/layout/LockingStringBuilderEncoder.java | 14 +- .../log4j/core/layout/MarkerPatternSelector.java | 2 - .../logging/log4j/core/layout/MessageLayout.java | 66 + .../logging/log4j/core/layout/Rfc5424Layout.java | 67 +- .../log4j/core/layout/ScriptPatternSelector.java | 1 - .../log4j/core/layout/SerializedLayout.java | 7 + .../log4j/core/layout/StringBuilderEncoder.java | 96 +- .../log4j/core/layout/TextEncoderHelper.java | 270 +- .../logging/log4j/core/layout/XmlLayout.java | 217 +- .../logging/log4j/core/layout/YamlLayout.java | 740 +--- .../logging/log4j/core/lookup/JndiLookup.java | 5 +- .../logging/log4j/core/lookup/MapLookup.java | 6 +- .../core/message/ExtendedThreadInfoFactory.java | 58 + .../core}/message/ExtendedThreadInformation.java | 3 +- .../apache/logging/log4j/core/net/JndiManager.java | 337 +- .../logging/log4j/core/net/SocketAddress.java | 6 + .../logging/log4j/core/net/SocketOptions.java | 33 +- .../core/net/SocketPerformancePreferences.java | 2 - .../logging/log4j/core/net/SslSocketManager.java | 134 +- .../logging/log4j/core/net/TcpSocketManager.java | 204 +- .../core/net/mom/jms/AbstractJmsReceiver.java | 48 - .../log4j/core/net/mom/jms/JmsQueueReceiver.java | 46 - .../log4j/core/net/mom/jms/JmsTopicReceiver.java | 46 - .../log4j/core/net/mom/jms/package-info.java | 26 - .../core/net/server/AbstractSocketServer.java | 222 -- .../core/net/server/InputStreamLogEventBridge.java | 103 - .../logging/log4j/core/net/server/JmsServer.java | 148 - .../net/server/JsonInputStreamLogEventBridge.java | 90 - .../log4j/core/net/server/LogEventBridge.java | 57 - .../server/ObjectInputStreamLogEventBridge.java | 64 - .../log4j/core/net/server/TcpSocketServer.java | 333 -- .../log4j/core/net/server/UdpSocketServer.java | 185 - .../net/server/XmlInputStreamLogEventBridge.java | 54 - .../net/ssl/AbstractKeyStoreConfiguration.java | 55 +- .../log4j/core/net/ssl/KeyStoreConfiguration.java | 57 +- .../ssl/LaxHostnameVerifier.java} | 29 +- .../log4j/core/net/ssl/SslConfiguration.java | 29 + .../log4j/core/net/ssl/StoreConfiguration.java | 66 +- .../core/net/ssl/StoreConfigurationException.java | 4 + .../core/net/ssl/TrustStoreConfiguration.java | 49 +- .../apache/logging/log4j/core/osgi/Activator.java | 28 +- .../log4j/core/osgi/BundleContextSelector.java | 4 +- .../core/parser/AbstractJacksonLogEventParser.java | 61 + .../JsonLogEventParser.java} | 17 +- .../logging/log4j/core/parser/LogEventParser.java | 47 + .../NotANumber.java => parser/ParseException.java} | 21 +- .../log4j/core/parser/TextLogEventParser.java | 27 +- .../XmlLogEventParser.java} | 17 +- .../YamlLogEventParser.java} | 17 +- .../NotANumber.java => parser/package-info.java} | 16 +- .../pattern/ExtendedThrowablePatternConverter.java | 3 +- .../log4j/core/pattern/HighlightConverter.java | 10 +- .../log4j/core/pattern/MapPatternConverter.java | 10 +- .../log4j/core/pattern/MdcPatternConverter.java | 6 +- .../logging/log4j/core/pattern/NotANumber.java | 1 + .../core/pattern/ProcessIdPatternConverter.java | 72 + .../pattern/RootThrowablePatternConverter.java | 2 +- .../logging/log4j/core/pattern/StyleConverter.java | 9 +- .../core/pattern/ThrowablePatternConverter.java | 12 +- .../logging/log4j/core/script/ScriptManager.java | 43 +- .../core/selector/ClassLoaderContextSelector.java | 4 +- .../log4j/core/selector/JndiContextSelector.java | 8 +- .../BasicCommandLineArguments.java} | 22 +- .../CustomLoggerGenerator.java} | 20 +- .../ExtendedLoggerGenerator.java} | 20 +- .../apache/logging/log4j/core/tools/Generate.java | 1724 ++++----- .../log4j/core/tools/picocli/CommandLine.java | 3900 ++++++++++++++++++++ .../log4j/core/util/BasicCommandLineArguments.java | 47 - .../logging/log4j/core/util/CronExpression.java | 16 +- .../logging/log4j/core/util/CyclicBuffer.java | 22 +- .../apache/logging/log4j/core/util/FileUtils.java | 65 +- .../log4j/core/util/FilteredObjectInputStream.java | 67 - .../apache/logging/log4j/core/util/JsonUtils.java | 2 +- .../logging/log4j/core/util/WatchManager.java | 25 +- .../log4j/core/util/datetime/FixedDateFormat.java | 2 +- log4j-core/src/main/resources/Log4j-config.xsd | 2 +- .../resources/META-INF/log4j-provider.properties | 18 - ...g4j.message.ThreadDumpMessage$ThreadInfoFactory | 1 + .../services/org.apache.logging.log4j.spi.Provider | 1 + .../org/apache/logging/log4j/MarkerMixInTest.java | 2 - .../apache/logging/log4j/MarkerMixInXmlTest.java | 2 +- .../org/apache/logging/log4j/TestMarkers.java} | 17 +- .../logging/log4j/core/CollectionLoggingTest.java | 4 +- .../apache/logging/log4j/core/CronRolloverApp.java | 4 +- .../logging/log4j/core/GcFreeLoggingTestUtil.java | 6 +- .../apache/logging/log4j/core/LogEventTest.java | 22 + .../core/appender/AsyncAppenderNoLocationTest.java | 20 +- .../appender/ConsoleAppenderJAnsiMessageMain.java | 1 - .../core/appender/FileAppenderPermissionsTest.java | 216 ++ .../FileAppenderPermissionsXmlConfigTest.java | 66 + .../log4j/core/appender/HttpAppenderTest.java | 245 ++ .../core/appender/MemoryMappedFileManagerTest.java | 2 +- .../core/appender/OutputStreamManagerTest.java | 58 + .../core/appender/RandomAccessFileManagerTest.java | 4 +- .../SecureSocketAppenderSocketOptionsTest.java | 12 +- .../log4j/core/appender/SmtpAppenderTest.java | 21 - .../appender/SocketAppenderSocketOptionsTest.java | 12 +- .../log4j/core/appender/SocketAppenderTest.java | 30 +- .../appender/SyslogAppenderCustomLayoutTest.java | 76 +- .../core/appender/SyslogAppenderTestBase.java | 8 +- ....java => JdbcAppenderHsqldbDataSourceTest.java} | 4 +- ...va => JdbcAppenderHsqldbFactoryMethodTest.java} | 6 +- ...ppenderTest.java => JpaHsqldbAppenderTest.java} | 4 +- .../{LogEventTest.java => LogEventEntityTest.java} | 2 +- .../log4j/core/appender/mom/JmsAppenderTest.java | 20 +- .../core/appender/mom/kafka/KafkaAppenderTest.java | 15 +- .../appender/rewrite/MapRewritePolicyTest.java | 24 +- .../core/appender/rewrite/RewriteAppenderTest.java | 5 +- .../appender/rolling/CronTriggeringPolicyTest.java | 278 +- .../core/appender/rolling/EligibleFilesTest.java | 10 +- .../rolling/OnStartupTriggeringPolicyTest.java | 2 +- .../RollingAppenderCronEvery2DirectTest.java | 4 +- .../rolling/RollingAppenderCronEvery2Test.java | 11 +- ...erDirectWriteTempCompressedFilePatternTest.java | 103 + ...ollingAppenderDirectWriteWithFilenameTest.java} | 35 +- ...lingAppenderDirectWriteWithReconfigureTest.java | 77 + .../rolling/RollingAppenderReconfigureTest.java | 93 + ...RollingAppenderSizeCompressPermissionsTest.java | 107 + .../rolling/RollingAppenderSizeNoCompressTest.java | 6 +- .../appender/rolling/RollingAppenderSizeTest.java | 5 - ...llingAppenderTempCompressedFilePatternTest.java | 154 + .../RollingFileAppenderReconfigureTest.java} | 18 +- ...derReconfigureUndefinedSystemPropertyTest.java} | 18 +- .../rolling/RollingFileAppenderUpdateDataTest.java | 97 + .../RollingRandomAccessFileManagerTest.java | 37 +- .../RollingRandomAppenderDirectWriteTest.java | 66 + ...RandomAppenderDirectWriteWithFilenameTest.java} | 36 +- .../async/AbstractAsyncThreadContextTestBase.java | 1 + .../AsyncLoggerThreadContextCopyOnWriteTest.java | 2 +- .../AsyncLoggerThreadContextGarbageFreeTest.java | 2 +- .../log4j/core/async/Log4j2Jira1688AsyncTest.java | 1 - .../log4j/core/async/RingBufferLogEventTest.java | 1 - .../core/config/CompositeConfigurationTest.java | 490 +-- .../log4j/core/config/LoggerConfigTest.java | 25 +- .../LoggersPluginTest.java} | 42 +- .../config/builder/ConfigurationAssemblerTest.java | 6 +- .../config/builder/ConfigurationBuilderTest.java | 16 + .../config/builder/CustomConfigurationFactory.java | 11 + ...rtiesConfigurationTrailingSpaceOnLevelTest.java | 67 + .../xml/XmlConigurationSecurity.java} | 22 +- .../logging/log4j/core/filter/MapFilterTest.java | 8 +- .../logging/log4j/core/impl/Log4jLogEventTest.java | 7 +- .../log4j/core/impl/MutableLogEventTest.java | 1 - .../core/impl/NestedLoggingFromToStringTest.java | 16 +- .../log4j/core/impl/ThrowableProxyTest.java | 30 +- .../log4j/core/jackson/LevelMixInJsonTest.java | 2 +- .../core/jackson/StackTraceElementMixInTest.java | 2 +- .../core/layout/AbstractStringLayoutTest.java | 29 +- .../ConcurrentLoggingWithJsonLayoutTest.java | 2 - .../logging/log4j/core/layout/GelfLayoutTest.java | 24 +- .../logging/log4j/core/layout/GelfLayoutTest2.java | 8 +- .../logging/log4j/core/layout/JsonLayoutTest.java | 48 +- .../log4j/core/layout/PatternLayoutTest.java | 17 +- .../log4j/core/layout/Rfc5424LayoutTest.java | 103 +- .../core/layout/SpyByteBufferDestination.java | 10 + .../core/layout/StringBuilderEncoderTest.java | 39 +- .../logging/log4j/core/layout/XmlLayoutTest.java | 71 +- .../logging/log4j/core/layout/YamlLayoutTest.java | 69 +- .../logging/log4j/core/lookup/MapLookupTest.java | 4 +- .../log4j/core/lookup/StrSubstitutorTest.java | 2 +- .../message/ExtendedThreadInformationTest.java} | 26 +- .../core/net/server/AbstractSocketServerTest.java | 237 -- .../core/net/server/SslXmlSocketServerTest.java | 104 - .../core/net/server/TcpJsonSocketServerTest.java | 62 - .../net/server/TcpSerializedSocketServerTest.java | 63 - .../core/net/server/TcpXmlSocketServerTest.java | 65 - .../log4j/core/net/server/ThreadNameFilter.java | 39 - .../core/net/server/ThreadPriorityFilter.java | 40 - .../core/net/server/UdpJsonSocketServerTest.java | 58 - .../net/server/UdpSerializedSocketServerTest.java | 60 - .../core/net/server/UdpXmlSocketServerTest.java | 61 - .../core/net/ssl/KeyStoreConfigurationTest.java | 2 +- .../log4j/core/net/ssl/SslConfigurationTest.java | 48 +- .../log4j/core/net/ssl/StoreConfigurationTest.java | 10 +- .../logging/log4j/core/net/ssl/TestConstants.java | 16 +- .../core/net/ssl/TrustStoreConfigurationTest.java | 4 +- .../log4j/core/parser/JsonLogEventParserTest.java | 129 + .../log4j/core/parser/LogEventParserTest.java | 55 + .../log4j/core/parser/XmlLogEventParserTest.java | 124 + .../log4j/core/parser/YamlLogEventParserTest.java | 118 + .../log4j/core/pattern/HighlightConverterTest.java | 34 + .../core/pattern/MapPatternConverterTest.java | 6 +- .../pattern/ProcessIdPatternConverterTest.java} | 26 +- .../log4j/core/pattern/StyleConverterTest.java | 6 + .../pattern/ThrowablePatternConverterTest.java | 4 +- .../core/tools/picocli/CommandLineHelpTest.java | 1634 ++++++++ .../log4j/core/tools/picocli/CommandLineTest.java | 2921 +++++++++++++++ .../log4j/core/tools/picocli/CustomLayoutDemo.java | 265 ++ .../logging/log4j/core/tools/picocli/Demo.java | 652 ++++ .../log4j/core/util/CronExpressionTest.java | 56 +- .../logging/log4j/core/util/CyclicBufferTest.java | 94 + .../logging/log4j/core/util/JsonUtilsTest.java | 18 +- .../org/apache/logging/log4j/core/util/Timer.java | 273 -- .../core/util/datetime/FixedDateFormatTest.java | 748 ++-- .../log4j/junit/AbstractExternalFileCleaner.java | 22 +- .../org/apache/logging/log4j/junit/CleanFiles.java | 10 +- .../apache/logging/log4j/junit/CleanFolders.java | 68 +- .../logging/log4j/junit/LoggerContextRule.java | 8 +- .../test/AvailablePortSystemPropertyRule.java | 81 + .../RuleChainFactory.java} | 40 +- .../log4j/test/appender/EncodingListAppender.java | 10 + .../logging/log4j/test/appender/ListAppender.java | 8 + log4j-core/src/test/resources/HttpAppenderTest.xml | 29 + .../src/test/resources/KafkaAppenderTest.xml | 88 +- .../test/resources/XmlConfigurationSecurity.xml | 28 +- log4j-core/src/test/resources/log4j-posix.xml | 14 + .../resources/log4j-rolling-direct-reconfigure.xml | 47 + .../log4j-rolling-direct-tmp-compress-folder.xml | 52 + .../src/test/resources/log4j-rolling-gz-posix.xml | 70 + .../resources/log4j-rolling-gz-tmp-compress.xml | 62 + .../test/resources/log4j-rolling-random-direct.xml | 50 + .../test/resources/log4j-rolling-reconfigure.xml | 59 + .../src/test/resources/log4j-socket-options.xml | 1 + .../test/resources/log4j-ssl-socket-options.xml | 1 + ...2-properties-trailing-space-on-level.properties | 39 + .../src/test/resources/log4j2-random-1833.xml | 24 + .../src/test/resources/log4j2-rolling-1833.xml | 24 + .../multipleIncompatibleAppendersTest.xml | 47 + ...ket-options.xml => multipleRootLoggersTest.xml} | 18 +- .../db/jdbc/log4j2-hsqldb-factory-method.xml | 2 +- .../rolling-file-appender-reconfigure.original.xml | 39 + .../rolling-file-appender-reconfigure.xml | 39 + log4j-distribution/pom.xml | 29 +- log4j-flume-ng/pom.xml | 2 +- .../logging/log4j/flume/appender/FlumeEvent.java | 11 +- .../appender/FlumePersistentAppenderTest.java | 2 +- log4j-iostreams/pom.xml | 2 +- .../org/apache/logging/log4j/io/IoBuilder.java | 4 +- log4j-jcl/pom.xml | 2 +- .../org/apache/logging/log4j/jcl/LogAdapter.java | 4 +- log4j-jmx-gui/pom.xml | 24 +- log4j-jul/pom.xml | 2 +- .../logging/log4j/jul/AbstractLoggerAdapter.java | 4 +- .../org/apache/logging/log4j/jul/ApiLogger.java | 12 +- log4j-liquibase/pom.xml | 2 +- log4j-nosql/pom.xml | 4 +- .../nosql/appender/couchdb/CouchDbProvider.java | 2 +- .../nosql/appender/mongodb/MongoDbConnection.java | 184 +- .../nosql/appender/mongodb/MongoDbProvider.java | 389 +- .../log4j/nosql/appender/MongoDbCappedTest.java | 38 +- .../nosql/appender/cassandra/CassandraRule.java | 8 +- .../src/test/resources/log4j2-mongodb-capped.xml | 26 +- log4j-osgi/pom.xml | 2 +- log4j-perf/pom.xml | 13 +- ...bstractStringLayoutStringEncodingBenchmark.java | 17 +- .../jmh/FileAppenderWithLocationBenchmark.java | 115 + .../log4j/perf/jmh/Log4jLogEventBenchmark.java | 37 +- .../log4j/perf/jmh/ReflectionBenchmark.java | 59 +- .../log4j/perf/jmh/TextEncoderHelperBenchmark.java | 13 +- .../logging/log4j/perf/nogc/DemoAppender.java | 17 +- .../logging/log4j/perf/util/DemoAppender.java | 11 + .../src/main/resources/log4j12-perfloc.xml | 29 +- .../src/main/resources/log4j2-perfloc.xml | 20 +- .../src/main/resources/logback-perfloc.xml | 28 +- log4j-samples/configuration/pom.xml | 10 +- log4j-samples/flume-common/pom.xml | 10 +- log4j-samples/flume-embedded/pom.xml | 10 +- log4j-samples/flume-remote/pom.xml | 10 +- log4j-samples/loggerProperties/pom.xml | 10 +- .../logging/log4j/lookup/CustomMapMessage.java | 4 +- .../logging/log4j/lookup/MapMessageLookup.java | 6 +- log4j-samples/pom.xml | 11 +- log4j-samples/scala-api/.gitignore | 3 - log4j-samples/scala-api/pom.xml | 80 - .../logging/log4j/scalasample/LoggingApp.scala | 47 - log4j-slf4j-impl/pom.xml | 7 +- .../apache/logging/slf4j/Log4jLoggerFactory.java | 6 +- log4j-taglib/pom.xml | 2 +- log4j-to-slf4j/pom.xml | 2 +- .../org/apache/logging/slf4j/SLF4JProvider.java | 18 +- .../resources/META-INF/log4j-provider.properties | 19 - .../services/org.apache.logging.log4j.spi.Provider | 1 + log4j-web/pom.xml | 2 +- mvnw | 236 -- mvnw.cmd | 146 - pom.xml | 182 +- src/changes/announcement.vm | 50 +- src/changes/changes.xml | 283 +- toolchains-docker.xml | 42 + toolchains-sample-linux.xml | 52 + toolchains-sample-mac.xml | 52 + toolchains-sample-win.xml | 52 + 463 files changed, 24300 insertions(+), 14121 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
