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

vy pushed a commit to branch recycler-api-3.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 3b1608c2e9b41a031e82ea1de89b699699a8fa77
Merge: 21abf71034 ccfff49100
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Mon Mar 20 22:43:21 2023 +0100

    Merge changes from `main`

 .../log4j/layout/template/json/resolver/StackTraceStringResolver.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --cc 
log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolver.java
index a39a8d6180,b22463f9e7..c02f8f11b4
--- 
a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolver.java
+++ 
b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolver.java
@@@ -23,9 -23,7 +23,11 @@@ import java.util.regex.Matcher
  import java.util.regex.Pattern;
  import java.util.stream.Collectors;
  
--import org.apache.logging.log4j.layout.template.json.util.*;
++import org.apache.logging.log4j.layout.template.json.util.CharSequencePointer;
++import org.apache.logging.log4j.layout.template.json.util.JsonWriter;
++import 
org.apache.logging.log4j.layout.template.json.util.TruncatingBufferedPrintWriter;
 +import org.apache.logging.log4j.spi.Recycler;
 +import org.apache.logging.log4j.spi.RecyclerFactory;
  
  /**
   * Exception stack trace to JSON string resolver used by {@link 
ExceptionResolver}.

Reply via email to