This is an automated email from the ASF dual-hosted git repository.
vernedeng pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit e9887d174a19c086e68dd9ecd81f0cd6cbf53b35
Author: megru <53897686+zhaoniu...@users.noreply.github.com>
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 8eda8a585a..3ae4acd501 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 403fce1a9a..0164218944 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 d762dd3e78..cc5118e915 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 cb4440fd21..99253b7435 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 ecc7758249..e4ee27c4e3 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 136f20c07c..9bb89d8600 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>
