From 45be9cc58d911abc8401414f07c9040ab8e6e759 Mon Sep 17 00:00:00 2001
From: Norbert Meszaros <meszinorbi2002@gmail.com>
Date: Mon, 11 Aug 2025 14:44:59 +0200
Subject: [PATCH 1/2] PHOENIX-7680 Update slf4j in Phoenix related repos

---
 bin/phoenix_queryserver_utils.py                      | 2 +-
 phoenix-queryserver-assembly/pom.xml                  | 2 +-
 phoenix-queryserver-assembly/src/assembly/cluster.xml | 2 +-
 phoenix-queryserver-it/pom.xml                        | 2 +-
 pom.xml                                               | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/phoenix_queryserver_utils.py b/bin/phoenix_queryserver_utils.py
index bd5bcf0..c7aba3c 100755
--- a/bin/phoenix_queryserver_utils.py
+++ b/bin/phoenix_queryserver_utils.py
@@ -85,7 +85,7 @@ def setPath():
     PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-queryserver-[!c]*.jar"
     PHOENIX_LOADBALANCER_JAR_PATTERN = "load-balancer-*[!t][!e][!s][!t][!s].jar"
     SQLLINE_WITH_DEPS_PATTERN = "sqlline-*-jar-with-dependencies.jar"
-    SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j*.jar"
+    SLF4J_BACKEND_JAR_PATTERN = "log4j-slf4j2*.jar"
     JCL_OVER_SLF4J_PATTERN = "jcl-over-slf4j*.jar"
     LOGGING_JAR_PATTERN = "log4j-core*.jar"
     LOGGING_JAR_PATTERN2 = "log4j-api*.jar"
diff --git a/phoenix-queryserver-assembly/pom.xml b/phoenix-queryserver-assembly/pom.xml
index 8fb7211..8df2fe7 100644
--- a/phoenix-queryserver-assembly/pom.xml
+++ b/phoenix-queryserver-assembly/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/phoenix-queryserver-assembly/src/assembly/cluster.xml b/phoenix-queryserver-assembly/src/assembly/cluster.xml
index 473669c..c7a1546 100644
--- a/phoenix-queryserver-assembly/src/assembly/cluster.xml
+++ b/phoenix-queryserver-assembly/src/assembly/cluster.xml
@@ -59,7 +59,7 @@
         <outputDirectory>phoenix-queryserver-${project.parent.version}/lib</outputDirectory>
         <includes>
           <include>sqlline:sqlline:jar:jar-with-dependencies</include>
-          <include>org.apache.logging.log4j:log4j-slf4j-impl</include>
+          <include>org.apache.logging.log4j:log4j-slf4j2-impl</include>
           <include>org.apache.logging.log4j:log4j-api</include>
           <include>org.apache.logging.log4j:log4j-core</include>
           <include>org.apache.logging.log4j:log4j-1.2-api</include>
diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml
index 6d3f422..50c8142 100644
--- a/phoenix-queryserver-it/pom.xml
+++ b/phoenix-queryserver-it/pom.xml
@@ -205,7 +205,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 72f6aa8..182f58e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,11 +86,11 @@
         <netty-bom.version>4.1.119.Final</netty-bom.version>
         <commons-io.version>2.18.0</commons-io.version>
         <sqlline.version>1.9.0</sqlline.version>
-        <slf4j.version>1.7.36</slf4j.version>
+        <slf4j.version>2.0.17</slf4j.version>
         <avatica.version>1.27.0</avatica.version>
         <servlet.api.version>3.1.0</servlet.api.version>
         <jsr305.version>3.0.0</jsr305.version>
-        <log4j2.version>2.20.0</log4j2.version>
+        <log4j2.version>2.25.1</log4j2.version>
 
         <!-- Test Dependency versions -->
         <testng.version>6.10</testng.version>
@@ -778,7 +778,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j-impl</artifactId>
+                <artifactId>log4j-slf4j2-impl</artifactId>
                 <version>${log4j2.version}</version>
             </dependency>
             <dependency>

From 3aa871c8a4d72a0f598bc33faa48ffbc9473cec0 Mon Sep 17 00:00:00 2001
From: Norbert Meszaros <meszinorbi2002@gmail.com>
Date: Wed, 17 Sep 2025 16:30:05 +0200
Subject: [PATCH 2/2] PHOENIX-7680 Add slf4j-api to phoenix-queryserver-it

---
 phoenix-queryserver-it/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml
index 50c8142..4270b0d 100644
--- a/phoenix-queryserver-it/pom.xml
+++ b/phoenix-queryserver-it/pom.xml
@@ -218,5 +218,10 @@
       <artifactId>log4j-1.2-api</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>