[karaf] branch karaf-4.2.x updated: [KARAF-7090] Fix log4j pattern using CRLF encode

[jb...@apache.org]

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

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new 15e020a  [KARAF-7090] Fix log4j pattern using CRLF encode
15e020a is described below

commit 15e020a78721e161d83d6830ddd216e45db49670
Author: jbonofre <jb...@apache.org>
AuthorDate: Thu Apr 29 10:11:36 2021 +0200

    [KARAF-7090] Fix log4j pattern using CRLF encode
    
    (cherry picked from commit 0d4118d5c43f3b66d164705f7216881fac9a0fa6)
---
 .../base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
index 4593485..5c52e39 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
+++ b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
@@ -26,7 +26,7 @@ color.debug = cyan
 color.trace = cyan
 
 # Common pattern layout for appenders
-log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %encode{%.-500m}%n
+log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %encode{%.-500m}{CRLF}%n
 log4j2.out.pattern = \u001b[90m%d{HH:mm:ss\.SSS}\u001b[0m %highlight{%-5level}{FATAL=${color.fatal}, ERROR=${color.error}, WARN=${color.warn}, INFO=${color.info}, DEBUG=${color.debug}, TRACE=${color.trace}} \u001b[90m[%t]\u001b[0m %msg%n%throwable