You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/04/21 06:18:38 UTC
[02/19] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ee2690bb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ee2690bb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ee2690bb
Branch: refs/heads/java9NoMultiRelease
Commit: ee2690bbaffc5a9b91d10a029c2059b4f9b1d533
Parents: ea72ac7 ccc30dc
Author: rpopma <rp...@apache.org>
Authored: Sun Apr 9 08:21:25 2017 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Apr 9 08:21:25 2017 +0900
----------------------------------------------------------------------
BUILDING.md | 2 +-
README.md | 2 +
RELEASE-NOTES.md | 74 ++++++++++---------
log4j-1.2-api/pom.xml | 2 +-
log4j-api-scala_2.10/pom.xml | 2 +-
log4j-api-scala_2.11/pom.xml | 2 +-
log4j-api/pom.xml | 2 +-
.../org/apache/logging/log4j/ThreadContext.java | 5 +-
log4j-bom/pom.xml | 2 +-
log4j-core-its/pom.xml | 2 +-
log4j-core/pom.xml | 2 +-
.../core/appender/RandomAccessFileAppender.java | 2 +-
.../apache/logging/log4j/core/config/Order.java | 2 +-
.../log4j/core/config/OrderComparator.java | 2 +-
.../core/net/server/AbstractSocketServer.java | 13 ++++
.../server/ObjectInputStreamLogEventBridge.java | 23 +++++-
.../log4j/core/net/server/TcpSocketServer.java | 25 ++++++-
.../log4j/core/net/server/UdpSocketServer.java | 18 ++++-
.../core/util/FilteredObjectInputStream.java | 67 +++++++++++++++++
.../apache/logging/log4j/core/net/ssl/README | 2 +-
log4j-distribution/pom.xml | 2 +-
log4j-distribution/src/assembly/bin.xml | 4 +-
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-osgi/pom.xml | 2 +-
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-samples/scala-api/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 | 29 +++++---
src/changes/changes.xml | 22 +++++-
src/site/markdown/maven-artifacts.md.vm | 2 +-
src/site/resources/images/logo.png | Bin 40517 -> 40494 bytes
.../logo/logo-electric-blue-2-2.8.2.png | Bin 0 -> 40494 bytes
.../logo/logo-electric-blue-2-2.8.2.xcf | Bin 0 -> 67168 bytes
.../resources/logo/logo-electric-blue-2.xcf | Bin 0 -> 66097 bytes
49 files changed, 262 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ee2690bb/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index 753802b,88faf7b..30a45eb
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -30,9 -30,20 +30,20 @@@
- "update" - Change
- "remove" - Removed
-->
- <release version="2.8.2" date="2017-MM-DD" description="GA Release 2.8.2">
+ <release version="2.9.0" date="2017-MM-DD" description="GA Release 2.9.0">
+ <action issue="LOG4J2-1868" dev="ggregory" type="fix">
+ Update ZeroMQ's JeroMQ from 0.3.6 to 0.4.0.
+ </action>
+ </release>
+ <release version="2.8.2" date="2017-04-02" description="GA Release 2.8.2">
+ <action issue="LOG4J2-1861" dev="mattsicker" type="fix">
+ Fix JavaDoc on org.apache.logging.log4j.ThreadContext about inheritance.
+ </action>
+ <action issue="LOG4J2-1862" dev="mattsicker" type="fix" due-to="wangyuntao">
+ Fix JavaDoc about @Order and OrderComparator ordering.
+ </action>
<action issue="LOG4J2-1849" dev="rpopma" type="fix">
- Fixed daylight savings time issue with FixedDateFormat.
+ Fixed daylight savings time (DST) issue with FixedDateFormat.
</action>
<action issue="LOG4J2-1850" dev="mattsicker" type="fix" due-to="Ludovic Hochet">
Fix CassandraRule and unit tests on Windows.