From ee78a2c2d4c38e9ba827d534ba4eb3132073cc05 Mon Sep 17 00:00:00 2001
From: Ronaldo Lanhellas <ronaldo.lanhellas@gmail.com>
Date: Sun, 15 Jun 2025 11:53:26 -0300
Subject: [PATCH] feat: adding new JsonTemplateLayout support for logging in
 Cluster Operator (strimzi#11415)

Signed-off-by: Ronaldo Lanhellas <ronaldo.lanhellas@gmail.com>
---
 CHANGELOG.md             | 1 +
 cluster-operator/pom.xml | 7 +++++++
 pom.xml                  | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9b8512599..f419b30dcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Add support for Kafka 3.9.1
 * Fixed MirrorMaker 2 client rack init container override being ignored.
 * Support for Kubernetes Image Volumes to mount custom plugins
+* Adding support for [JsonTemplateLayout](https://logging.apache.org/log4j/2.x/manual/json-template-layout.html) in Log4j2
 
 ### Major changes, deprecations and removals
 
diff --git a/cluster-operator/pom.xml b/cluster-operator/pom.xml
index 486e67d61d..da79f2b5f9 100644
--- a/cluster-operator/pom.xml
+++ b/cluster-operator/pom.xml
@@ -138,6 +138,11 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-layout-template-json</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>kafka-oauth-server</artifactId>
@@ -322,6 +327,8 @@
                                 <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core</ignoredUnusedDeclaredDependency>
                                 <!-- Needed for logging using the Kubernetes Client (uses SLF4J) -->
                                 <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
+                                <!-- Needed for adding new appender JsonTemplateLayout support for logging, it's a runtime dep -->
+                                <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-layout-template-json</ignoredUnusedDeclaredDependency>
                                 <!-- Used to provide native epoll for Netty-->
                                 <ignoredUnusedDeclaredDependency>io.netty:netty-transport-native-epoll:jar</ignoredUnusedDeclaredDependency>
                                 <!-- Used by KafkaConnectApiIT -->
diff --git a/pom.xml b/pom.xml
index 94bc2d31f3..c0b43e19f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -444,6 +444,12 @@
                 <artifactId>log4j-slf4j-impl</artifactId>
                 <version>${log4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-layout-template-json</artifactId>
+                <version>${log4j.version}</version>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.kafka</groupId>
                 <artifactId>kafka-clients</artifactId>