From 85db70816aea5efa9feebb520a7f8d59d0ae2af7 Mon Sep 17 00:00:00 2001
From: Lonre Wang <lonrevip@gmail.com>
Date: Mon, 19 Nov 2018 12:30:59 +0800
Subject: [PATCH] Fix log4j pattern layout

---
 dubbo-cluster/src/test/resources/log4j.xml                    | 2 +-
 dubbo-config/dubbo-config-api/src/test/resources/log4j.xml    | 2 +-
 dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml | 2 +-
 .../dubbo-container-spring/src/test/resources/log4j.xml       | 2 +-
 .../dubbo-demo-consumer/src/main/resources/log4j.properties   | 2 +-
 .../dubbo-demo-provider/src/main/resources/log4j.properties   | 2 +-
 .../dubbo-registry-api/src/test/resources/log4j.xml           | 2 +-
 .../dubbo-registry-default/src/test/resources/log4j.xml       | 2 +-
 .../dubbo-remoting-api/src/test/resources/log4j.xml           | 2 +-
 dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml        | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dubbo-cluster/src/test/resources/log4j.xml b/dubbo-cluster/src/test/resources/log4j.xml
index 9b7df211e96..df9d68a0fab 100644
--- a/dubbo-cluster/src/test/resources/log4j.xml
+++ b/dubbo-cluster/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
     <appender name="DUBBO" class="org.apache.dubbo.common.utils.DubboAppender">
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n"/>
+            <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n"/>
         </layout>
     </appender>
     <root>
diff --git a/dubbo-config/dubbo-config-api/src/test/resources/log4j.xml b/dubbo-config/dubbo-config-api/src/test/resources/log4j.xml
index 4a9fe2e9c4a..5007dd1d1bc 100644
--- a/dubbo-config/dubbo-config-api/src/test/resources/log4j.xml
+++ b/dubbo-config/dubbo-config-api/src/test/resources/log4j.xml
@@ -18,7 +18,7 @@
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
     <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n"/>
+            <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n"/>
         </layout>
     </appender>
     <root>
diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml b/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml
index 63be60179cb..bbb7f03f981 100644
--- a/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml
+++ b/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
     <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n"/>
+            <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n"/>
         </layout>
     </appender>
 
diff --git a/dubbo-container/dubbo-container-spring/src/test/resources/log4j.xml b/dubbo-container/dubbo-container-spring/src/test/resources/log4j.xml
index 18f2b5f1391..f0370700874 100644
--- a/dubbo-container/dubbo-container-spring/src/test/resources/log4j.xml
+++ b/dubbo-container/dubbo-container-spring/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
     <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n"/>
+            <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n"/>
         </layout>
     </appender>
     <root>
diff --git a/dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties b/dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties
index 63f4e27e3c6..24243814906 100644
--- a/dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties
+++ b/dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties
@@ -4,4 +4,4 @@ log4j.rootLogger=info, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n
\ No newline at end of file
diff --git a/dubbo-demo/dubbo-demo-provider/src/main/resources/log4j.properties b/dubbo-demo/dubbo-demo-provider/src/main/resources/log4j.properties
index d95684642d3..15a0900f0d2 100644
--- a/dubbo-demo/dubbo-demo-provider/src/main/resources/log4j.properties
+++ b/dubbo-demo/dubbo-demo-provider/src/main/resources/log4j.properties
@@ -4,4 +4,4 @@ log4j.rootLogger=info, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n
\ No newline at end of file
diff --git a/dubbo-registry/dubbo-registry-api/src/test/resources/log4j.xml b/dubbo-registry/dubbo-registry-api/src/test/resources/log4j.xml
index ff12d5b0915..f5c44f1f4ef 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/resources/log4j.xml
+++ b/dubbo-registry/dubbo-registry-api/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
     <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %5p %c{2}: %m%n"/>
+            <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS z}] %5p %c{2}: %m%n"/>
         </layout>
     </appender>
     <root>
diff --git a/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml b/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml
index 9e129907d34..c8d6d8c5b58 100644
--- a/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml
+++ b/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml
@@ -32,7 +32,7 @@
     </appender>
     <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %5p %c{2}: %m%n"/>
+            <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS z}] %5p %c{2}: %m%n"/>
         </layout>
     </appender>
     <root>
diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/resources/log4j.xml b/dubbo-remoting/dubbo-remoting-api/src/test/resources/log4j.xml
index b91d2d6ad7a..927212a49b1 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/test/resources/log4j.xml
+++ b/dubbo-remoting/dubbo-remoting-api/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
     <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n"/>
+            <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2}: %m%n"/>
         </layout>
     </appender>
     <root>
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml b/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml
index 0af90b6084a..3c5d2ba218e 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml
@@ -33,9 +33,9 @@
     <appender name="FILE" class="org.apache.log4j.FileAppender">
         <param name="File" value="dubbo.log"/>
         <layout class="org.apache.log4j.PatternLayout">
-            <!-- <param name="ConversionPattern" value="[%t %d{dd/MM/yy hh:mm:ss:sss
+            <!-- <param name="ConversionPattern" value="[%t %d{dd/MM/yy HH:mm:ss:SSS
                 z}] %5p %c{2}: %L %m%n" /> -->
-            <param name="ConversionPattern" value="[%t %l %d{dd/MM/yy hh:mm:ss:sss z}] %5p %m %n"/>
+            <param name="ConversionPattern" value="[%t %l %d{dd/MM/yy HH:mm:ss:SSS z}] %5p %m %n"/>
         </layout>
     </appender>
     <root>