You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/06/29 02:12:57 UTC

[1/2] 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/master 594e573f5 -> 04acee201


[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/master
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/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Posted by gg...@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/master
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(+)
----------------------------------------------------------------------