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

morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
     new 5e444fd12e [branch-1.2](pom) remove unsafe log4j (#17117)
5e444fd12e is described below

commit 5e444fd12e4e92cb0833dba98c9f1797abb2aa87
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Sat Feb 25 09:10:08 2023 +0800

    [branch-1.2](pom) remove unsafe log4j (#17117)
---
 fe/fe-core/pom.xml                    |  2 +-
 fe/hive-udf/pom.xml                   |  8 ++++++--
 fe/pom.xml                            | 12 +++++++++++-
 fe/spark-dpp/pom.xml                  |  2 +-
 fs_brokers/apache_hdfs_broker/pom.xml |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 094bbbb94a..16b9e8db23 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -262,7 +262,7 @@ under the License.
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.9</version>
+            <version>2.0.0</version>
         </dependency>
         <!-- 
https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core -->
         <dependency>
diff --git a/fe/hive-udf/pom.xml b/fe/hive-udf/pom.xml
index e6fcb23403..40743f8ada 100644
--- a/fe/hive-udf/pom.xml
+++ b/fe/hive-udf/pom.xml
@@ -49,12 +49,16 @@ under the License.
                     <artifactId>velocity</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>commons-httpclient</artifactId>
                     <groupId>commons-httpclient</groupId>
+                    <artifactId>commons-httpclient</artifactId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>avatica</artifactId>
                     <groupId>org.apache.calcite.avatica</groupId>
+                    <artifactId>avatica</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.zookeeper:zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/fe/pom.xml b/fe/pom.xml
index f2b6b72ec9..e715cf3c9a 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -226,7 +226,7 @@ under the License.
         <iceberg.version>1.1.0</iceberg.version>
         <avro.version>1.10.1</avro.version>
         <!-- hudi -->
-        <hudi.version>0.10.0</hudi.version>
+        <hudi.version>0.13.0</hudi.version>
         <parquet.version>1.10.1</parquet.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <scala.version>2.12.10</scala.version>
@@ -737,6 +737,10 @@ under the License.
                         <groupId>org.apache.hbase</groupId>
                         <artifactId>hbase-client</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -875,6 +879,12 @@ under the License.
                 <groupId>org.apache.hudi</groupId>
                 <artifactId>hudi-common</artifactId>
                 <version>${hudi.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- 
https://mvnrepository.com/artifact/org.apache.hudi/hudi-hadoop-mr -->
diff --git a/fe/spark-dpp/pom.xml b/fe/spark-dpp/pom.xml
index bd4bd33990..a494274aa9 100644
--- a/fe/spark-dpp/pom.xml
+++ b/fe/spark-dpp/pom.xml
@@ -78,7 +78,7 @@ under the License.
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.9</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
         <!-- spark -->
diff --git a/fs_brokers/apache_hdfs_broker/pom.xml 
b/fs_brokers/apache_hdfs_broker/pom.xml
index bea0443d56..243f625afe 100644
--- a/fs_brokers/apache_hdfs_broker/pom.xml
+++ b/fs_brokers/apache_hdfs_broker/pom.xml
@@ -282,7 +282,7 @@ under the License.
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
         <!-- support jdk9 -->


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to