From c2fa0ff7bae95e0f5bcb54af6f3d70d5bc46cfee Mon Sep 17 00:00:00 2001
From: Cesar Munoz <56847527+LikeTheSalad@users.noreply.github.com>
Date: Mon, 13 Apr 2026 12:10:57 +0200
Subject: [PATCH] Bumping log4j version

---
 .../co/elastic/logging/EcsJsonSerializer.java |  4 +++
 log4j2-ecs-layout/pom.xml                     | 27 ++++++++++++++++---
 .../log4j2/AbstractLog4j2EcsLayoutTest.java   |  2 +-
 .../Log4j2EcsLayoutIntegrationTest.java       |  2 +-
 .../logging/log4j2/Log4j2EcsLayoutTest.java   |  4 +--
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java b/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java
index dfb7411d..46c802ca 100644
--- a/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java
+++ b/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java
@@ -302,6 +302,10 @@ private static void formatStackTraceAsArray(StringBuilder builder, CharSequence
             if (index < length) {
                 // append remaining line
                 appendStackTraceLine(builder, stackTrace, index, length);
+            } else {
+                // stack trace ends with newline, remove trailing comma and newline
+                removeIfEndsWith(builder, NEW_LINE);
+                removeIfEndsWith(builder, ",");
             }
         } else {
             // no newlines found, add entire stack trace as single element
diff --git a/log4j2-ecs-layout/pom.xml b/log4j2-ecs-layout/pom.xml
index ea09d125..7d0e009f 100644
--- a/log4j2-ecs-layout/pom.xml
+++ b/log4j2-ecs-layout/pom.xml
@@ -9,7 +9,7 @@
 
     <properties>
         <parent.base.dir>${project.basedir}/..</parent.base.dir>
-        <version.log4j>2.17.1</version.log4j>
+        <version.log4j>2.25.4</version.log4j>
     </properties>
 
     <artifactId>log4j2-ecs-layout</artifactId>
@@ -76,10 +76,31 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
+            <artifactId>log4j-core-test</artifactId>
             <version>${version.log4j}</version>
-            <type>test-jar</type>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.platform</groupId>
+                    <artifactId>junit-platform-commons</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.platform</groupId>
+                    <artifactId>junit-platform-launcher</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.platform</groupId>
+                    <artifactId>junit-platform-engine</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-params</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit-pioneer</groupId>
+                    <artifactId>junit-pioneer</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/AbstractLog4j2EcsLayoutTest.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/AbstractLog4j2EcsLayoutTest.java
index 3363a0fb..60ab1970 100644
--- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/AbstractLog4j2EcsLayoutTest.java
+++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/AbstractLog4j2EcsLayoutTest.java
@@ -31,7 +31,7 @@
 import org.apache.logging.log4j.ThreadContext;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.message.ObjectMessage;
-import org.apache.logging.log4j.test.appender.ListAppender;
+import org.apache.logging.log4j.core.test.appender.ListAppender;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutIntegrationTest.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutIntegrationTest.java
index 24fa667b..97cd8326 100644
--- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutIntegrationTest.java
+++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutIntegrationTest.java
@@ -26,7 +26,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.test.appender.ListAppender;
+import org.apache.logging.log4j.core.test.appender.ListAppender;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java
index 0896ce5f..33f4af44 100644
--- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java
+++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java
@@ -27,11 +27,11 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.BasicConfigurationFactory;
+import org.apache.logging.log4j.core.test.BasicConfigurationFactory;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.util.KeyValuePair;
-import org.apache.logging.log4j.test.appender.ListAppender;
+import org.apache.logging.log4j.core.test.appender.ListAppender;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;