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

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 2cfdd6ac82 [INLONG-8474][CVE] Unify the version of "hive-exec" (#8485)
2cfdd6ac82 is described below

commit 2cfdd6ac829b4a9da3945beba8dd90f8e5416c05
Author: megru <[email protected]>
AuthorDate: Mon Jul 10 19:46:58 2023 +0800

    [INLONG-8474][CVE] Unify the version of "hive-exec" (#8485)
---
 inlong-sort-standalone/pom.xml                                   | 2 +-
 inlong-sort/pom.xml                                              | 2 --
 .../sort-flink/sort-flink-v1.13/sort-connectors/hive/pom.xml     | 2 --
 .../sort-flink/sort-flink-v1.13/sort-connectors/hudi/pom.xml     | 2 +-
 .../sort-flink/sort-flink-v1.13/sort-connectors/iceberg/pom.xml  | 2 +-
 pom.xml                                                          | 9 +++++----
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/inlong-sort-standalone/pom.xml b/inlong-sort-standalone/pom.xml
index db6f6cebee..723c83cb3f 100644
--- a/inlong-sort-standalone/pom.xml
+++ b/inlong-sort-standalone/pom.xml
@@ -196,7 +196,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-jdbc</artifactId>
-            <version>${hive.version}</version>
+            <version>${hive3x.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.eclipse.jetty.orbit</groupId>
diff --git a/inlong-sort/pom.xml b/inlong-sort/pom.xml
index df11704051..17daa583d7 100644
--- a/inlong-sort/pom.xml
+++ b/inlong-sort/pom.xml
@@ -45,8 +45,6 @@
         <kafka.clients.version>2.7.0</kafka.clients.version>
         <rat.basedir>${basedir}</rat.basedir>
         <hbase.version>2.2.3</hbase.version>
-        <iceberg.hive.version>2.3.7</iceberg.hive.version>
-        <hudi.hive.version>2.3.7</hudi.hive.version>
     </properties>
 
     <dependencyManagement>
diff --git 
a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hive/pom.xml 
b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hive/pom.xml
index 4b5c9668e3..4f0f16e8fc 100644
--- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hive/pom.xml
+++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hive/pom.xml
@@ -31,8 +31,6 @@
 
     <properties>
         
<inlong.root.dir>${project.parent.parent.parent.parent.parent.basedir}</inlong.root.dir>
-        <hive3x.version>3.1.3</hive3x.version>
-        <hive2x.version>2.2.0</hive2x.version>
         <orc.core.version>1.4.3</orc.core.version>
         <aircompressor.version>0.8</aircompressor.version>
     </properties>
diff --git 
a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hudi/pom.xml 
b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hudi/pom.xml
index 81e8697b1b..de73a9b500 100644
--- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hudi/pom.xml
+++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hudi/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
-            <version>${hudi.hive.version}</version>
+            <version>${hive2x.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>log4j</groupId>
diff --git 
a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/pom.xml 
b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/pom.xml
index 922d6fe7b9..b094b79867 100644
--- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/pom.xml
+++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/iceberg/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
-            <version>${iceberg.hive.version}</version>
+            <version>${hive2x.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>log4j</groupId>
diff --git a/pom.xml b/pom.xml
index 01c915e38f..21b6a77bd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,8 @@
         <fastjson.version>1.2.83</fastjson.version>
 
         <clickhouse-jdbc.version>0.3.1</clickhouse-jdbc.version>
-        <hive.version>3.1.3</hive.version>
+        <hive2x.version>2.3.7</hive2x.version>
+        <hive3x.version>3.1.3</hive3x.version>
         <flume.version>1.10.0</flume.version>
         <hbase.version>2.4.12</hbase.version>
 
@@ -250,7 +251,7 @@
             <dependency>
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-jdbc</artifactId>
-                <version>${hive.version}</version>
+                <version>${hive3x.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>xml-apis</groupId>
@@ -277,7 +278,7 @@
             <dependency>
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-metastore</artifactId>
-                <version>${hive.version}</version>
+                <version>${hive3x.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.logging.log4j</groupId>
@@ -296,7 +297,7 @@
             <dependency>
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-exec</artifactId>
-                <version>${hive.version}</version>
+                <version>${hive3x.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.pentaho</groupId>

Reply via email to