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:50:22 UTC
[1/5] logging-log4j2 git commit: [LOG4J2-1934] JMS Appender does not
know how to recover from a broken connection.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1958 13b714dea -> df34929c8
[LOG4J2-1934] JMS Appender does not know how to recover from a broken
connection.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5d1b605d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5d1b605d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5d1b605d
Branch: refs/heads/LOG4J2-1958
Commit: 5d1b605d922d37c02afdd656ccdb4afae2864cd0
Parents: a5a9588
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Jun 28 19:12:10 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Jun 28 19:12:10 2017 -0700
----------------------------------------------------------------------
.../log4j/core/appender/mom/activemq/JmsAppenderConnectLaterIT.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5d1b605d/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderConnectLaterIT.java
----------------------------------------------------------------------
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderConnectLaterIT.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderConnectLaterIT.java
index 8f548d2..6fcb9d2 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderConnectLaterIT.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/JmsAppenderConnectLaterIT.java
@@ -42,6 +42,7 @@ import org.junit.experimental.categories.Category;
* connection. See https://issues.apache.org/jira/browse/LOG4J2-1934
* </p>
*/
+@Ignore
@Category(Appenders.Jms.class)
public class JmsAppenderConnectLaterIT {
[2/5] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by mi...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/04acee20
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/04acee20
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/04acee20
Branch: refs/heads/LOG4J2-1958
Commit: 04acee201919ce57d99009b625b5e91a8d9e052c
Parents: 5d1b605 594e573
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Jun 28 19:12:29 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Jun 28 19:12:29 2017 -0700
----------------------------------------------------------------------
.../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(+)
----------------------------------------------------------------------
[5/5] logging-log4j2 git commit: LOG4J2-1958 Mention in release notes
Posted by mi...@apache.org.
LOG4J2-1958 Mention in release notes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/df34929c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/df34929c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/df34929c
Branch: refs/heads/LOG4J2-1958
Commit: df34929c8237467a53e2a6df660ad31d6dc213b6
Parents: 002a193
Author: Mikael Ståldal <mi...@staldal.nu>
Authored: Thu Jun 29 17:50:16 2017 +0200
Committer: Mikael Ståldal <mi...@staldal.nu>
Committed: Thu Jun 29 17:50:16 2017 +0200
----------------------------------------------------------------------
src/changes/announcement.vm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/df34929c/src/changes/announcement.vm
----------------------------------------------------------------------
diff --git a/src/changes/announcement.vm b/src/changes/announcement.vm
index e06994e..d4a71ca 100644
--- a/src/changes/announcement.vm
+++ b/src/changes/announcement.vm
@@ -50,6 +50,30 @@ temporary objects) while logging. In addition, Log4j 2 will not lose events whil
This release primarily contains bugfixes and minor enhancements. More details on the new features and
fixes are itemized below.
+Note that subsequent to the 2.9 release, for security reasons, SerializedLayout is deprecated and no
+longer used as default in the Socket and JMS appenders. SerializedLayout can still be used as before,
+but has to be specified explicitly. To retain old behaviour, you have to change configuration like:
+
+ <Appenders>
+ <Socket name="socket" host="localhost" port="9500"/>
+ </Appenders>
+
+into:
+
+ <Appenders>
+ <Socket name="socket" host="localhost" port="9500">
+ <SerializedLayout/>
+ </Socket>
+ </Appenders>
+
+We do, however, discourage the use of SerializedLayout and recommend JsonLayout as a replacement:
+
+ <Appenders>
+ <Socket name="socket" host="localhost" port="9500">
+ <JsonLayout properties="true"/>
+ </Socket>
+ </Appenders>
+
Note that subsequent to the 2.9 release, for security reasons, Log4j does not process DTD in XML files.
If you used DTD for including snippets, you have to use XInclude or Composite Configuration instead.
[4/5] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1958
Posted by mi...@apache.org.
Merge branch 'master' into LOG4J2-1958
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/002a1933
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/002a1933
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/002a1933
Branch: refs/heads/LOG4J2-1958
Commit: 002a19332c6f3cbbecdd93a4310e498bd24bee8e
Parents: 13b714d 7444973
Author: Mikael Ståldal <mi...@staldal.nu>
Authored: Thu Jun 29 17:42:55 2017 +0200
Committer: Mikael Ståldal <mi...@staldal.nu>
Committed: Thu Jun 29 17:42:55 2017 +0200
----------------------------------------------------------------------
.../core/appender/mom/activemq/JmsAppenderConnectLaterIT.java | 1 +
src/changes/announcement.vm | 3 +++
src/site/xdoc/manual/configuration.xml.vm | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/5] logging-log4j2 git commit: LOG4J2-1959 Mention in release notes
Posted by mi...@apache.org.
LOG4J2-1959 Mention in release notes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/74449738
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/74449738
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/74449738
Branch: refs/heads/LOG4J2-1958
Commit: 74449738c08d2ea98926dcc205213d9ff5014b6c
Parents: 04acee2
Author: Mikael Ståldal <mi...@staldal.nu>
Authored: Thu Jun 29 17:41:56 2017 +0200
Committer: Mikael Ståldal <mi...@staldal.nu>
Committed: Thu Jun 29 17:41:56 2017 +0200
----------------------------------------------------------------------
src/changes/announcement.vm | 3 +++
src/site/xdoc/manual/configuration.xml.vm | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/74449738/src/changes/announcement.vm
----------------------------------------------------------------------
diff --git a/src/changes/announcement.vm b/src/changes/announcement.vm
index 6168aba..e06994e 100644
--- a/src/changes/announcement.vm
+++ b/src/changes/announcement.vm
@@ -50,6 +50,9 @@ temporary objects) while logging. In addition, Log4j 2 will not lose events whil
This release primarily contains bugfixes and minor enhancements. More details on the new features and
fixes are itemized below.
+Note that subsequent to the 2.9 release, for security reasons, Log4j does not process DTD in XML files.
+If you used DTD for including snippets, you have to use XInclude or Composite Configuration instead.
+
Note that subsequent to the 2.6 release a minor source incompatibility was found due to the
addition of new methods to the Logger interface. If you have code that does:
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/74449738/src/site/xdoc/manual/configuration.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm
index b5f7af2..b70b306 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -358,7 +358,7 @@ public class Bar {
<a name="ConfigurationSyntax"/>
<subsection name="Configuration Syntax">
<p>
- As of version 2.9, for security reasons, Log4j does not process DTDs in XML files.
+ As of version 2.9, for security reasons, Log4j does not process DTD in XML files.
If you want to split the configuration in multiple files, use <a href="#XInclude">XInclude</a> or
<a href="#CompositeConfiguration">Composite Configuration</a>.
</p>