You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/06/29 15:51:51 UTC
[5/8] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1958
Merge branch 'master' into LOG4J2-1958
# 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/2d4b2c1b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2d4b2c1b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2d4b2c1b
Branch: refs/heads/master
Commit: 2d4b2c1bba45b7440457a14d5ffa8fb0557fc6a0
Parents: 61db8af 594e573
Author: Mikael Ståldal <mi...@staldal.nu>
Authored: Wed Jun 28 17:09:37 2017 +0200
Committer: Mikael Ståldal <mi...@staldal.nu>
Committed: Wed Jun 28 17:09:37 2017 +0200
----------------------------------------------------------------------
.../log4j/core/config/xml/XmlConfiguration.java | 11 ++++++
.../config/xml/XmlConigurationSecurity.java | 36 ++++++++++++++++++++
.../test/resources/XmlConfigurationSecurity.xml | 34 ++++++++++++++++++
src/changes/changes.xml | 3 ++
src/site/xdoc/manual/configuration.xml.vm | 5 +++
5 files changed, 89 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2d4b2c1b/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index 305b4c3,75bb8ce..e86eb72
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -31,9 -31,9 +31,12 @@@
- "remove" - Removed
-->
<release version="2.9.0" date="2017-MM-DD" description="GA Release 2.9.0">
+ <action issue="LOG4J2-1958" dev="mikes" type="update">
+ Deprecate SerializedLayout and remove it as default.
+ </action>
+ <action issue="LOG4J2-1959" dev="mikes" type="update">
+ Disable DTD processing in XML configuration files.
+ </action>
<action issue="LOG4J2-1766" dev="ggregory" type="add" due-to="Pierrick HYMBERT">
Temporary compress directory during rollover (#88).
</action>