From 7fd832aab648e0676dd7f2522ab283b2913e9f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cv=5Fkkhuang=E2=80=9D?= <“420895376@qq.com”>
Date: Mon, 25 Mar 2024 14:14:50 +0800
Subject: [PATCH] update log4j and velocity version for UBS

---
 .../engineconn-plugins/hive/pom.xml                    | 10 +++++++++-
 .../linkis-metadata-manager/service/hive/pom.xml       | 10 +++++++++-
 pom.xml                                                |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
index 20003a7499..d48414118d 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
@@ -118,6 +118,10 @@
             <artifactId>hive-exec</artifactId>
             <version>${hive.version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>org.apache.velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.pentaho</groupId>
                     <artifactId>pentaho-aggdesigner-algorithm</artifactId>
@@ -200,7 +204,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.3</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
index dc36f515da..a2235e4aea 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
@@ -244,9 +244,17 @@
                     <artifactId>httpcore</artifactId>
                     <groupId>org.apache.httpcomponents</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.velocity</groupId>
+                    <artifactId>velocity</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.3</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
diff --git a/pom.xml b/pom.xml
index 1e083a76cb..c895550aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
         <assembly.package.rootpath>${basedir}</assembly.package.rootpath>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <log4j2.version>2.17.2</log4j2.version>
+        <log4j2.version>2.17.1</log4j2.version>
         <spotless.version>2.4.2</spotless.version>
         <junit5.version>5.7.2</junit5.version>
         <mockito.version>3.9.0</mockito.version>