logging-log4j2 git commit: Better JUnit assert message.

2017-09-11 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master a6392fe11 -> 3c3901dd1


Better JUnit assert message.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3c3901dd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3c3901dd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3c3901dd

Branch: refs/heads/master
Commit: 3c3901dd17ecf59cee5cbe7bdcc3a87145a1ff6d
Parents: a6392fe
Author: Gary Gregory 
Authored: Mon Sep 11 23:58:39 2017 -0600
Committer: Gary Gregory 
Committed: Mon Sep 11 23:58:39 2017 -0600

--
 .../log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3c3901dd/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
index c61af57..8abdae1 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
@@ -62,8 +62,9 @@ public abstract class AbstractJpaAppenderTest {
 public void tearDown() throws SQLException {
 final LoggerContext context = LoggerContext.getContext(false);
 try {
-final Appender appender = 
context.getConfiguration().getAppender("databaseAppender");
-assertNotNull("The appender should not be null.", appender);
+String appenderName = "databaseAppender";
+final Appender appender = 
context.getConfiguration().getAppender(appenderName);
+assertNotNull("The appender '" + appenderName + "' should not be 
null.", appender);
 assertTrue("The appender should be a JpaAppender.", appender 
instanceof JpaAppender);
 ((JpaAppender) appender).getManager().close();
 } finally {

logging-log4j2 git commit: Disable build of Tomcat integration - delay for 2.10.0

2017-09-11 Thread rgoers 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 3a66d6147 -> a6392fe11


Disable build of Tomcat integration - delay for 2.10.0


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a6392fe1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a6392fe1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a6392fe1

Branch: refs/heads/master
Commit: a6392fe114e9ba1c2b5bb5429d810de720120c71
Parents: 3a66d61
Author: Ralph Goers 
Authored: Mon Sep 11 21:06:18 2017 -0700
Committer: Ralph Goers 
Committed: Mon Sep 11 21:06:18 2017 -0700

--
 pom.xml | 2 +-
 src/changes/changes.xml | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a6392fe1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4af4e63..450d4e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1294,7 +1294,7 @@
 log4j-iostreams
 log4j-jul
 log4j-liquibase
-log4j-appserver
+
   
   
 

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a6392fe1/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index eb9c4da..0fee463 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,9 +31,6 @@
  - "remove" - Removed
 -->
 
-  
-Provide support for overriding the Tomcat Log class in Tomcat 8.5+.
-  
   
 Inspect all known ClassLoaders to locate the service provider.

logging-log4j2 git commit: Update tests from org.eclipse.persistence.jpa 2.6.4 to 2.6.5.

2017-09-11 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master c9b1cf8c0 -> 3a66d6147


Update tests from org.eclipse.persistence.jpa 2.6.4 to 2.6.5.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3a66d614
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3a66d614
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3a66d614

Branch: refs/heads/master
Commit: 3a66d61479eff4e783ad2262993fc2aec7e84a9a
Parents: c9b1cf8
Author: Gary Gregory 
Authored: Mon Sep 11 18:34:27 2017 -0600
Committer: Gary Gregory 
Committed: Mon Sep 11 18:34:27 2017 -0600

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3a66d614/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 37c80b7..4af4e63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -698,7 +698,7 @@
   
 org.eclipse.persistence
 org.eclipse.persistence.jpa
-2.6.4
+2.6.5
   
   
 org.eclipse.persistence

logging-log4j2 git commit: Revert "Remove unused imports."

2017-09-11 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 471ef52e4 -> c9b1cf8c0


Revert "Remove unused imports."

This reverts commit 0051b1b33d56c8ed6a55684114bacbbb08c1f747.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c9b1cf8c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c9b1cf8c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c9b1cf8c

Branch: refs/heads/master
Commit: c9b1cf8c0ce37cfd4beadcc5b3d4391840be22f2
Parents: 471ef52
Author: Gary Gregory 
Authored: Mon Sep 11 18:00:06 2017 -0600
Committer: Gary Gregory 
Committed: Mon Sep 11 18:00:06 2017 -0600

--
 .../java/org/apache/logging/log4j/util/PropertiesUtilTest.java   | 1 +
 .../org/apache/logging/log4j/core/appender/mom/JmsManager.java   | 1 +
 .../logging/log4j/core/config/plugins/util/ResolverUtil.java | 1 +
 .../java/org/apache/logging/log4j/core/impl/MutableLogEvent.java | 1 +
 .../java/org/apache/logging/log4j/core/net/TcpSocketManager.java | 3 +++
 .../logging/log4j/core/pattern/ProcessIdPatternConverter.java| 4 
 .../org/apache/logging/log4j/core/tools/picocli/CommandLine.java | 1 +
 .../org/apache/logging/log4j/core/appender/HttpAppenderTest.java | 1 +
 .../org/apache/logging/log4j/core/appender/SmtpAppenderTest.java | 1 +
 .../rolling/RollingAppenderDirectWriteWithFilenameTest.java  | 1 +
 .../apache/logging/log4j/core/net/ssl/SslConfigurationTest.java  | 1 +
 .../logging/log4j/core/tools/picocli/CustomLayoutDemo.java   | 1 +
 .../apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java| 2 ++
 13 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c9b1cf8c/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
--
diff --git 
a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java 
b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
index 4dd5e7e..99dbeb9 100644
--- 
a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
+++ 
b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.util;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
 import java.util.Map;
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c9b1cf8c/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
index c4df884..f2090e3 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
@@ -18,6 +18,7 @@
 package org.apache.logging.log4j.core.appender.mom;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c9b1cf8c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
index 29fe395..3ef796a 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.config.plugins.util;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c9b1cf8c/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
index 97f5ff3..50c30bf 100644
---

logging-log4j2 git commit: [LOG4J2-2046] Update Apache Commons Compress from 1.13 to 1.14.

2017-09-11 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 0051b1b33 -> 471ef52e4


[LOG4J2-2046] Update Apache Commons Compress from 1.13 to 1.14.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/471ef52e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/471ef52e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/471ef52e

Branch: refs/heads/master
Commit: 471ef52e44cba5bc7394c47146ba7726a3a1b1a9
Parents: 0051b1b
Author: Gary Gregory 
Authored: Mon Sep 11 15:36:22 2017 -0600
Committer: Gary Gregory 
Committed: Mon Sep 11 15:36:22 2017 -0600

--
 pom.xml | 2 +-
 src/changes/changes.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/471ef52e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 261e37a..37c80b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -761,7 +761,7 @@
   
 org.apache.commons
 commons-compress
-1.13
+1.14
   
   
 org.tukaani

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/471ef52e/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7fa4941..eb9c4da 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -61,6 +61,9 @@
   
 Update javax.mail from 1.5.6 to 1.6.0.
   
+  
+Update Apache Commons Compress from 1.13 to 1.14.
+

logging-log4j2 git commit: Remove unused imports.

2017-09-11 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 65ac1a56b -> 0051b1b33


Remove unused imports.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0051b1b3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0051b1b3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0051b1b3

Branch: refs/heads/master
Commit: 0051b1b33d56c8ed6a55684114bacbbb08c1f747
Parents: 65ac1a5
Author: Gary Gregory 
Authored: Mon Sep 11 12:14:31 2017 -0600
Committer: Gary Gregory 
Committed: Mon Sep 11 12:14:31 2017 -0600

--
 .../java/org/apache/logging/log4j/util/PropertiesUtilTest.java   | 1 -
 .../org/apache/logging/log4j/core/appender/mom/JmsManager.java   | 1 -
 .../logging/log4j/core/config/plugins/util/ResolverUtil.java | 1 -
 .../java/org/apache/logging/log4j/core/impl/MutableLogEvent.java | 1 -
 .../java/org/apache/logging/log4j/core/net/TcpSocketManager.java | 3 ---
 .../logging/log4j/core/pattern/ProcessIdPatternConverter.java| 4 
 .../org/apache/logging/log4j/core/tools/picocli/CommandLine.java | 1 -
 .../org/apache/logging/log4j/core/appender/HttpAppenderTest.java | 1 -
 .../org/apache/logging/log4j/core/appender/SmtpAppenderTest.java | 1 -
 .../rolling/RollingAppenderDirectWriteWithFilenameTest.java  | 1 -
 .../apache/logging/log4j/core/net/ssl/SslConfigurationTest.java  | 1 -
 .../logging/log4j/core/tools/picocli/CustomLayoutDemo.java   | 1 -
 .../apache/logging/log4j/jmx/gui/ClientGuiJConsolePlugin.java| 2 --
 13 files changed, 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0051b1b3/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
--
diff --git 
a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java 
b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
index 99dbeb9..4dd5e7e 100644
--- 
a/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
+++ 
b/log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.util;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.nio.charset.UnsupportedCharsetException;
 import java.util.Map;
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0051b1b3/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
index f2090e3..c4df884 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java
@@ -18,7 +18,6 @@
 package org.apache.logging.log4j.core.appender.mom;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0051b1b3/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
index 3ef796a..29fe395 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
@@ -18,7 +18,6 @@ package org.apache.logging.log4j.core.config.plugins.util;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0051b1b3/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
index 50c30bf..97f5ff3 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
+++

logging-log4j2 git commit: [LOG4J2-2045] Update javax.mail from 1.5.6 to 1.6.0.

2017-09-11 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master a270b6ea2 -> 65ac1a56b


[LOG4J2-2045] Update javax.mail from 1.5.6 to 1.6.0.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/65ac1a56
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/65ac1a56
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/65ac1a56

Branch: refs/heads/master
Commit: 65ac1a56b1c539165ec4a7285b69cac545ce41be
Parents: a270b6e
Author: Gary Gregory 
Authored: Mon Sep 11 12:11:49 2017 -0600
Committer: Gary Gregory 
Committed: Mon Sep 11 12:11:49 2017 -0600

--
 pom.xml | 2 +-
 src/changes/changes.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65ac1a56/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 46ddd7f..261e37a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -570,7 +570,7 @@
   
 com.sun.mail
 javax.mail
-1.5.6
+1.6.0
   
   
 org.jboss.spec.javax.jms

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65ac1a56/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0baa9f2..7fa4941 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -58,6 +58,9 @@
   
 Update Apache Commons CSV from 1.4 to 1.5.
   
+  
+Update javax.mail from 1.5.6 to 1.6.0.
+

logging-log4j2 git commit: [LOG4J2-2044] Update Apache Commons CSV from 1.4 to 1.5.

2017-09-11 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 7473ab7d2 -> a270b6ea2


[LOG4J2-2044] Update Apache Commons CSV from 1.4 to 1.5.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a270b6ea
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a270b6ea
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a270b6ea

Branch: refs/heads/master
Commit: a270b6ea25398840eb6a5ac56494dc9445caa5fa
Parents: 7473ab7
Author: Gary Gregory 
Authored: Mon Sep 11 11:47:50 2017 -0600
Committer: Gary Gregory 
Committed: Mon Sep 11 11:47:50 2017 -0600

--
 .../appender/CsvJsonParameterLayoutFileAppenderTest.java| 9 +++--
 pom.xml | 2 +-
 src/changes/changes.xml | 3 +++
 3 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a270b6ea/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
index e3acddd..2443d5b 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
@@ -91,23 +91,20 @@ public class CsvJsonParameterLayoutFileAppenderTest {
 
 @Test
 public void testNoNulCharactersOpenCurly() throws IOException {
-// TODO Why is the char quoted? Check Apache Commons CSV.
-testNoNulCharacters("{", "\"{\"");
+testNoNulCharacters("{", "{");
 }
 
 @Test
 public void testNoNulCharactersOpenParen() throws IOException {
-// TODO Why is the char quoted? Check Apache Commons CSV.
-testNoNulCharacters("(", "\"(\"");
+testNoNulCharacters("(", "(");
 }
 
 @Test
 public void testNoNulCharactersOpenSquare() throws IOException {
 // TODO Why is the char quoted? Check Apache Commons CSV.
-testNoNulCharacters("[", "\"[\"");
+testNoNulCharacters("[", "[");
 }
 
-@Test
 public void testNoNulCharactersThreeChars() throws IOException {
 testNoNulCharacters("ABC", "ABC");
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a270b6ea/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6ce79d7..46ddd7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -773,7 +773,7 @@
   
 org.apache.commons
 commons-csv
-1.4
+1.5
   
   
   

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a270b6ea/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 81ba0ac..0baa9f2 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -55,6 +55,9 @@
   
 Update Jackson from 2.9.0 to 2.9.1 (fix for Java 9.)
   
+  
+Update Apache Commons CSV from 1.4 to 1.5.
+

logging-log4j2 git commit: [LOG4J2-2043] Update Jackson from 2.9.0 to 2.9.1 (fix for Java 9.)

2017-09-11 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 3cb6238c1 -> 7473ab7d2


[LOG4J2-2043] Update Jackson from 2.9.0 to 2.9.1 (fix for Java 9.)

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7473ab7d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7473ab7d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7473ab7d

Branch: refs/heads/master
Commit: 7473ab7d29ec8c4b2dc85ee283f9c463f711a436
Parents: 3cb6238
Author: Gary Gregory 
Authored: Mon Sep 11 10:18:51 2017 -0600
Committer: Gary Gregory 
Committed: Mon Sep 11 10:18:51 2017 -0600

--
 pom.xml | 2 +-
 src/changes/changes.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7473ab7d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 7435004..6ce79d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
 1.7.25
 1.2.3
 1.9.13
-2.9.0
+2.9.1
 3.2.18.RELEASE
 1.7.0
 3.3.6

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7473ab7d/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1a8a79a..81ba0ac 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -52,6 +52,9 @@
   
 ClassNotFoundException when making all loggers asynchronous under OSGi 
environment.
   
+  
+Update Jackson from 2.9.0 to 2.9.1 (fix for Java 9.)
+

logging-log4j2 git commit: LOG4J2-2025 - Provide support for overriding the Tomcat Log class in Tomcat 8.5+.

2017-09-11 Thread rgoers 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 9422ca748 -> 3cb6238c1


LOG4J2-2025 - Provide support for overriding the Tomcat Log class in Tomcat 
8.5+.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3cb6238c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3cb6238c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3cb6238c

Branch: refs/heads/master
Commit: 3cb6238c148f529abb97a4894e36bf7c764ee60b
Parents: 9422ca7
Author: Ralph Goers 
Authored: Mon Sep 11 00:01:58 2017 -0700
Committer: Ralph Goers 
Committed: Mon Sep 11 00:01:58 2017 -0700

--
 .../org/apache/logging/log4j/LogManager.java|  25 +++
 log4j-appserver/pom.xml | 211 +++
 .../log4j/appserver/tomcat/TomcatLogger.java| 189 +
 .../log4j/appserver/tomcat/package-info.java|  20 ++
 .../services/org.apache.juli.logging.Log|   1 +
 log4j-appserver/src/site/markdown/index.md.vm   |  46 
 log4j-appserver/src/site/site.xml   |  52 +
 log4j-distribution/pom.xml  |  19 +-
 pom.xml |   1 +
 src/changes/changes.xml |   5 +-
 src/site/site.xml   |   1 +
 11 files changed, 568 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3cb6238c/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
--
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java 
b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
index 3f366bb..ecff443 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
@@ -333,6 +333,31 @@ public class LogManager {
 }
 }
 
+
+/**
+ * Returns a LoggerContext
+ *
+ * @param fqcn The fully qualified class name of the Class that this 
method is a member of.
+ * @param loader The ClassLoader for the context. If null the context will 
attempt to determine the appropriate
+ *ClassLoader.
+ * @param currentContext if false the LoggerContext appropriate for the 
caller of this method is returned. For
+ *example, in a web application if the caller is a class in 
WEB-INF/lib then one LoggerContext may be
+ *returned and if the caller is a class in the container's 
classpath then a different LoggerContext may
+ *be returned. If true then only a single LoggerContext will 
be returned.
+ * @param configLocation The URI for the configuration to use.
+ * @param name The LoggerContext name.
+ * @return a LoggerContext.
+ */
+protected static LoggerContext getContext(final String fqcn, final 
ClassLoader loader,
+  final boolean currentContext, 
URI configLocation, String name) {
+try {
+return factory.getContext(fqcn, loader, null, currentContext, 
configLocation, name);
+} catch (final IllegalStateException ex) {
+LOGGER.warn(ex.getMessage() + " Using SimpleLogger");
+return new SimpleLoggerContextFactory().getContext(fqcn, loader, 
null, currentContext);
+}
+}
+
 /**
  * Shutdown using the LoggerContext appropriate for the caller of this 
method.
  * This is equivalent to calling {@code LogManager.shutdown(false)}.

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3cb6238c/log4j-appserver/pom.xml
--
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
new file mode 100644
index 000..34822ef
--- /dev/null
+++ b/log4j-appserver/pom.xml
@@ -0,0 +1,211 @@
+
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  
+log4j
+org.apache.logging.log4j
+2.9.1-SNAPSHOT
+  
+  4.0.0
+
+  log4j-appserver
+  jar
+  Apache Log4j App Server Support
+  Provide Log4j as the logging implementation for application 
servers
+
+  
+${basedir}/..
+Web Documentation
+/log4j-appserver
+8.5.20
+  
+
+  
+
+  org.apache.logging.log4j
+  log4j-api
+
+
+  org.apache.logging.log4j
+  log4j-core
+
+
+  javax.servlet
+  javax.servlet-api
+  3.0.1
+  provided
+
+
+  org.apache.tomcat
+  tomcat-catalina
+  ${tomcat.version}
+  
+
+  org.apache.tomcat
+