Merge branch 'master' into LOG4J2-1661 # Conflicts: # src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/07369539 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/07369539 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/07369539 Branch: refs/heads/LOG4J2-1661 Commit: 07369539f47827504d4e7e42038d5595c9825458 Parents: 5fb3f02 62ddffd Author: Mikael Ståldal <[email protected]> Authored: Tue Nov 8 11:15:19 2016 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Tue Nov 8 11:15:19 2016 +0100 ---------------------------------------------------------------------- .../org/apache/logging/log4j/MarkerManager.java | 13 ++- .../CopyOnWriteSortedArrayThreadContextMap.java | 14 ++- .../GarbageFreeSortedArrayThreadContextMap.java | 14 ++- .../log4j/spi/ObjectThreadContextMap.java | 44 +++++++++ .../log4j/util/SortedArrayStringMap.java | 23 ++++- .../logging/log4j/util/DeserializerHelper.java | 47 ++++++++++ .../log4j/util/SortedArrayStringMapTest.java | 90 +++++++++++++++++- log4j-core/pom.xml | 24 ----- .../plugins/processor/PluginProcessor.java | 4 +- .../log4j/core/filter/CompositeFilter.java | 2 + .../core/filter/DynamicThresholdFilter.java | 12 +-- .../log4j/core/filter/LevelRangeFilter.java | 75 ++++++++++++++- .../logging/log4j/core/filter/MarkerFilter.java | 71 ++++++++++++++ .../log4j/core/filter/ThresholdFilter.java | 71 ++++++++++++++ .../logging/log4j/core/impl/Log4jLogEvent.java | 43 +++++++-- .../core/pattern/DatePatternConverter.java | 2 + .../pattern/EqualsBaseReplacementConverter.java | 99 ++++++++++++++++++++ .../EqualsIgnoreCaseReplacementConverter.java | 51 ++++------ .../pattern/EqualsReplacementConverter.java | 59 +++--------- .../core/pattern/FileDatePatternConverter.java | 2 + .../log4j/core/pattern/FormattingInfo.java | 3 + .../log4j/core/pattern/HighlightConverter.java | 2 + .../core/pattern/IntegerPatternConverter.java | 18 ++-- .../core/pattern/LevelPatternConverter.java | 2 + .../pattern/LineSeparatorPatternConverter.java | 2 + .../core/pattern/LiteralPatternConverter.java | 8 +- .../core/pattern/LoggerPatternConverter.java | 2 + .../core/pattern/MarkerPatternConverter.java | 7 +- .../MarkerSimpleNamePatternConverter.java | 2 + .../log4j/core/pattern/MaxLengthConverter.java | 19 ++-- .../log4j/core/pattern/MdcPatternConverter.java | 2 + .../core/pattern/MessagePatternConverter.java | 4 +- .../log4j/core/pattern/NameAbbreviator.java | 3 + .../core/pattern/NamePatternConverter.java | 3 + .../core/pattern/NanoTimePatternConverter.java | 2 + .../pattern/RelativeTimePatternConverter.java | 19 +--- .../pattern/SequenceNumberPatternConverter.java | 7 +- .../log4j/core/pattern/StyleConverter.java | 2 + .../core/pattern/ThreadIdPatternConverter.java | 4 +- .../pattern/ThreadNamePatternConverter.java | 2 + .../pattern/ThreadPriorityPatternConverter.java | 4 +- .../log4j/core/GcFreeLoggingTestUtil.java | 7 +- .../log4j/core/impl/Log4jLogEventTest.java | 4 +- .../pattern/EqualsReplacementConverterTest.java | 5 +- log4j-core/src/test/resources/gcFreeLogging.xml | 6 +- .../resources/gcFreeMixedSyncAsyncLogging.xml | 6 +- pom.xml | 36 ++++--- src/changes/changes.xml | 39 ++++++++ 48 files changed, 781 insertions(+), 199 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/07369539/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/07369539/src/changes/changes.xml ---------------------------------------------------------------------- diff --cc src/changes/changes.xml index 86cceb4,398893d..7d8d0dd --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -24,9 -24,45 +24,48 @@@ </properties> <body> <release version="2.8" date="2016-MM-DD" description="GA Release 2.8"> + <action issue="LOG4J2-1661" dev="mikes" type="add"> + Support Scala 2.12. + </action> + <action issue="LOG4J2-1674" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in ThresholdFilter. + </action> + <action issue="LOG4J2-1673" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in MarkerFilter. + </action> + <action issue="LOG4J2-1672" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in LevelRangeFilter. + </action> + <action issue="LOG4J2-1671" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in EqualsIgnoreCaseReplacementConverter. + </action> + <action issue="LOG4J2-1670" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in EqualsReplacementConverter. + </action> + <action issue="LOG4J2-1669" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in MaxLengthConverter. + </action> + <action issue="LOG4J2-1668" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in MarkerPatternConverter. + </action> + <action issue="LOG4J2-1667" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in SequenceNumberPatternConverter. + </action> + <action issue="LOG4J2-1666" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in RelativeTimePatternConverter. + </action> + <action issue="LOG4J2-1665" dev="rpopma" type="fix"> + (GC) Avoid allocating temporary objects in IntegerPatternConverter. + </action> + <action issue="LOG4J2-1637" dev="rpopma" type="fix"> + Fixed problems when used in OSGi containers (IllegalAccessError, NoClassDefFoundError). + </action> + <action issue="LOG4J2-1226" dev="rpopma" type="fix"> + Improve LogEvent serialization to handle non-serializable Messages and deserializing when required classes are missing. + </action> + <action issue="LOG4J2-1663" dev="rpopma" type="fix"> + Ensure SortedArrayStringMap can be serialized and deserialized without errors regardless of content. + </action> <action issue="LOG4J2-1660" dev="rpopma" type="add"> Added public method ThreadContext::getThreadContextMap; removed class ThreadContextAccess. </action>
