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

cryptoe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/master by this push:
     new 51aa8962a64 minor: bump Log4j dep to 2.26 and make JsonTemplateLayout 
available to operators in their custom  log4j configs (#19629)
51aa8962a64 is described below

commit 51aa8962a64db5241088601382e42e05f80de565
Author: Lucas Capistrant <[email protected]>
AuthorDate: Fri Jun 26 14:17:35 2026 -0500

    minor: bump Log4j dep to 2.26 and make JsonTemplateLayout available to 
operators in their custom  log4j configs (#19629)
    
    * Jump to log4j 2.26 and pull in log4j layout-template-json to allow 
operators to use modern json formatter instead of deprecated JsonLayout
    
    * fix licenses.yaml based on review tip
---
 licenses.yaml      | 6 +++++-
 pom.xml            | 7 ++++++-
 processing/pom.xml | 5 +++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/licenses.yaml b/licenses.yaml
index 10036e4d3f5..d36338a1fd3 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -2040,13 +2040,14 @@ name: Apache Log4j
 license_category: binary
 module: java-core
 license_name: Apache License version 2.0
-version: 2.25.4
+version: 2.26.0
 libraries:
   - org.apache.logging.log4j: log4j-1.2-api
   - org.apache.logging.log4j: log4j-api
   - org.apache.logging.log4j: log4j-core
   - org.apache.logging.log4j: log4j-jul
   - org.apache.logging.log4j: log4j-slf4j-impl
+  - org.apache.logging.log4j: log4j-layout-template-json
 notices:
   - log4j-1.2-api: |
       Apache Log4j 1.x Compatibility API
@@ -2069,6 +2070,9 @@ notices:
   - log4j-slf4j-impl: |
       Apache Log4j SLF4J Binding
       Copyright 1999-2015 Apache Software Foundation
+  - log4j-layout-template-json: |
+      Apache Log4j JSON Template Layout
+      Copyright 1999-2026 The Apache Software Foundation
 
 ---
 
diff --git a/pom.xml b/pom.xml
index 9128fca053a..36e8f2321bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
         <jersey.version>1.19.4</jersey.version>
         <jackson.version>2.21.4</jackson.version>
         <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
-        <log4j.version>2.25.4</log4j.version>
+        <log4j.version>2.26.0</log4j.version>
         <mysql.version>8.2.0</mysql.version>
         <mariadb.version>2.7.3</mariadb.version>
         <netty3.version>3.10.6.Final</netty3.version>
@@ -932,6 +932,11 @@
                 <artifactId>log4j-1.2-api</artifactId>
                 <version>${log4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-layout-template-json</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
             <dependency>
                 <!-- This is not slf4j's version because of performance 
concerns
                 
http://www.slf4j.org/api/org/slf4j/bridge/SLF4JBridgeHandler.html
diff --git a/processing/pom.xml b/processing/pom.xml
index 48a4d4999ef..3028c68baa7 100644
--- a/processing/pom.xml
+++ b/processing/pom.xml
@@ -159,6 +159,11 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-layout-template-json</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j2-impl</artifactId>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to