From da87f4d7e1ee550daa903e3b078c644f9b1743c3 Mon Sep 17 00:00:00 2001
From: psxjoy <psxjoy@outlook.com>
Date: Tue, 11 Mar 2025 20:19:35 +0800
Subject: [PATCH 1/2] fix: update log4j version to 2.24.3 and adjust related
 dependencies

---
 ozhera-demo-client/pom.xml |  3 +--
 ozhera-log/pom.xml         |  4 ++--
 pom.xml                    | 11 ++++++-----
 trace-etl/pom.xml          |  4 +---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ozhera-demo-client/pom.xml b/ozhera-demo-client/pom.xml
index ca2bc7286..d1349372d 100644
--- a/ozhera-demo-client/pom.xml
+++ b/ozhera-demo-client/pom.xml
@@ -41,9 +41,8 @@
         <module>ozhera-demo-client-server</module>
     </modules>
     <properties>
-        <log4j.version>2.18.0</log4j.version>
+        <log4j.version>2.24.3</log4j.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <logback.version>1.2.10</logback.version>
         <springboot.version>2.7.15</springboot.version>
         <spring.version>5.3.29</spring.version>
         <!-- Replace it with the absolute path of your own ozhera-demo-client project. -->
diff --git a/ozhera-log/pom.xml b/ozhera-log/pom.xml
index 3ca9905f5..50f504179 100644
--- a/ozhera-log/pom.xml
+++ b/ozhera-log/pom.xml
@@ -75,12 +75,12 @@ http://www.apache.org/licenses/LICENSE-2.0
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-1.2-api</artifactId>
-                <version>2.17.0</version>
+                <version>2.24.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-web</artifactId>
-                <version>2.17.0</version>
+                <version>2.24.3</version>
             </dependency>
 
             <dependency>
diff --git a/pom.xml b/pom.xml
index 110e8661e..5ca1c6751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,14 +19,15 @@
     under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
         <version>31</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <groupId>org.apache.ozhera</groupId>
@@ -383,12 +384,12 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>
-                <version>2.18.0</version>
+                <version>2.24.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-to-slf4j</artifactId>
-                <version>2.18.0</version>
+                <version>2.24.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.rocketmq</groupId>
@@ -1122,6 +1123,6 @@
         <url>https://github.com/apache/ozhera</url>
         <connection>scm:git:https://github.com/apache/ozhera.git</connection>
         <developerConnection>scm:git:https://github.com/apache/ozhera.git</developerConnection>
-      <tag>HEAD</tag>
+        <tag>HEAD</tag>
     </scm>
 </project>
\ No newline at end of file
diff --git a/trace-etl/pom.xml b/trace-etl/pom.xml
index 742c92846..fbf2a993c 100644
--- a/trace-etl/pom.xml
+++ b/trace-etl/pom.xml
@@ -49,9 +49,7 @@
 
     <properties>
         <log4j.version>2.18.0</log4j.version>
-        <slf4j.version>1.7.36</slf4j.version>
-        <logback.version>1.2.10</logback.version>
-        <lombok.version>1.18.30</lombok.version>
+        <slf4j.version>2.0.16</slf4j.version>
         <!--java20 is comparing the reasonable versions of Spring Boot and Spring. issue#19-->
         <springboot.version>2.7.15</springboot.version>
         <spring.version>5.3.29</spring.version>

From eee91303829eec8c318b7fd6464ed8723fa376e8 Mon Sep 17 00:00:00 2001
From: psxjoy <psxjoy@outlook.com>
Date: Wed, 12 Mar 2025 11:14:29 +0800
Subject: [PATCH 2/2] fix: update log4j version to 2.24.3 in pom.xml

---
 ozhera-demo-server/pom.xml | 2 +-
 trace-etl/pom.xml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ozhera-demo-server/pom.xml b/ozhera-demo-server/pom.xml
index d280a84d3..e5022f6ba 100644
--- a/ozhera-demo-server/pom.xml
+++ b/ozhera-demo-server/pom.xml
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <log4j.version>2.18.0</log4j.version>
+        <log4j.version>2.24.3</log4j.version>
         <slf4j.version>1.7.36</slf4j.version>
         <logback.version>1.2.10</logback.version>
         <springboot.version>2.7.15</springboot.version>
diff --git a/trace-etl/pom.xml b/trace-etl/pom.xml
index fbf2a993c..bb158e5df 100644
--- a/trace-etl/pom.xml
+++ b/trace-etl/pom.xml
@@ -48,7 +48,7 @@
     </modules>
 
     <properties>
-        <log4j.version>2.18.0</log4j.version>
+        <log4j.version>2.24.3</log4j.version>
         <slf4j.version>2.0.16</slf4j.version>
         <!--java20 is comparing the reasonable versions of Spring Boot and Spring. issue#19-->
         <springboot.version>2.7.15</springboot.version>