From b6b19b83af74501e319ed79b4af591debe480b57 Mon Sep 17 00:00:00 2001
From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com>
Date: Mon, 23 Oct 2023 14:25:56 +0530
Subject: [PATCH] Fix log warning (#13681)

* Fixes Log4j2 performance warning

* Updte log4j version
---
 openmetadata-shaded-deps/elasticsearch-dep/pom.xml | 4 ++++
 openmetadata-shaded-deps/opensearch-dep/pom.xml    | 4 ++++
 pom.xml                                            | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/openmetadata-shaded-deps/elasticsearch-dep/pom.xml b/openmetadata-shaded-deps/elasticsearch-dep/pom.xml
index 788f8dfe8cab..a467a451b522 100644
--- a/openmetadata-shaded-deps/elasticsearch-dep/pom.xml
+++ b/openmetadata-shaded-deps/elasticsearch-dep/pom.xml
@@ -122,6 +122,10 @@
                             <pattern>org.apache.lucene</pattern>
                             <shadedPattern>es.org.apache.lucene</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>META-INF/versions/9/org/apache/logging/log4j/</pattern>
+                            <shadedPattern>org/apache/logging/log4j/</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>
diff --git a/openmetadata-shaded-deps/opensearch-dep/pom.xml b/openmetadata-shaded-deps/opensearch-dep/pom.xml
index b995ba72b0be..b1f29a3684e0 100644
--- a/openmetadata-shaded-deps/opensearch-dep/pom.xml
+++ b/openmetadata-shaded-deps/opensearch-dep/pom.xml
@@ -122,6 +122,10 @@
                             <pattern>org.apache.lucene</pattern>
                             <shadedPattern>os.org.apache.lucene</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>META-INF/versions/9/org/apache/logging/log4j/</pattern>
+                            <shadedPattern>org/apache/logging/log4j/</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>
diff --git a/pom.xml b/pom.xml
index c9e7487bb67f..320aa8dc345c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
     <httpclient.version>4.5.14</httpclient.version>
     <!-- Upgrading to spring version 6.x requires Java 17 -->
     <spring.version>5.3.28</spring.version>
-    <log4j.version>2.20.0</log4j.version>
+    <log4j.version>2.21.0</log4j.version>
     <org.junit.jupiter.version>5.9.3</org.junit.jupiter.version>
     <dropwizard-health.version>1.7.3</dropwizard-health.version>
     <fernet.version>1.5.0</fernet.version>