[logging-log4j2] branch master updated: [LOG4J2-1246] PatternLayout %date conversion pattern should render time zone designator for ISO-ISO8601.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c530f4  [LOG4J2-1246] PatternLayout %date conversion pattern should 
render time zone designator for ISO-ISO8601.
2c530f4 is described below

commit 2c530f454a5193bf9a4d54ecec9415962c0c9e0f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Dec 5 11:32:05 2018 -0700

    [LOG4J2-1246] PatternLayout %date conversion pattern should render time
    zone designator for ISO-ISO8601.
    
    - Add new format in pattern layout %d{ISO8601_OFFSET_DATE_TIME_X}
    - Add new format in pattern layout %d{ISO8601_OFFSET_DATE_TIME_XX}
    - Add new format in pattern layout %d{ISO8601_OFFSET_DATE_TIME_XXX}
    - Add new format in pattern layout %d{ISO8601_OFFSET_DATE_TIME_Z}
---
 .../apache/logging/log4j/core/pattern/DatePatternConverterTest.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
index 2b815c1..bd96996 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/DatePatternConverterTest.java
@@ -440,7 +440,8 @@ public class DatePatternConverterTest {
         converter.format(event, sb);
 
         final SimpleDateFormat sdf = new 
SimpleDateFormat(converter.getPattern());
-        final String expected = sdf.format(new Date(event.getTimeMillis()));
+        final String format = sdf.format(new Date(event.getTimeMillis()));
+        final String expected = format.endsWith("Z") ? format.substring(0, 
format.length() - 1) + "+00:00" : format;
         assertEquals(expected, sb.toString());
     }