This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new a5037cc7954 [FLINK-27063][Connectors/Hive] Upgrade Hive 2.3 connector
from 2.3.6 to 2.3.9
a5037cc7954 is described below
commit a5037cc7954d401783671cbb2d347eedd84d8e92
Author: MartijnVisser <[email protected]>
AuthorDate: Tue Apr 5 19:47:08 2022 +0200
[FLINK-27063][Connectors/Hive] Upgrade Hive 2.3 connector from 2.3.6 to
2.3.9
---
.../docs/connectors/table/hive/overview.md | 9 ++++++---
.../content/docs/connectors/table/hive/overview.md | 9 ++++++---
flink-connectors/flink-connector-hive/pom.xml | 6 +++---
.../connectors/hive/HiveRunnerShimLoader.java | 2 ++
.../pom.xml | 6 +++---
.../src/main/resources/META-INF/NOTICE | 22 +++++++++++-----------
.../main/resources/META-INF/licenses/LICENSE.antlr | 0
.../resources/META-INF/licenses/LICENSE.javolution | 0
.../main/resources/META-INF/licenses/LICENSE.jodd | 0
.../main/resources/META-INF/licenses/LICENSE.kryo | 0
.../resources/META-INF/licenses/LICENSE.minlog | 0
.../resources/META-INF/licenses/LICENSE.protobuf | 0
.../resources/META-INF/licenses/LICENSE.reflectasm | 0
.../resources/META-INF/licenses/LICENSE.slf4j-api | 0
flink-connectors/pom.xml | 2 +-
pom.xml | 2 +-
...modules-defining-excess-dependencies.modulelist | 2 +-
17 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/docs/content.zh/docs/connectors/table/hive/overview.md
b/docs/content.zh/docs/connectors/table/hive/overview.md
index 7b31b92c0cb..0acc2427ce9 100644
--- a/docs/content.zh/docs/connectors/table/hive/overview.md
+++ b/docs/content.zh/docs/connectors/table/hive/overview.md
@@ -69,6 +69,9 @@ Flink 支持一下的 Hive 版本。
- 2.3.4
- 2.3.5
- 2.3.6
+ - 2.3.7
+ - 2.3.8
+ - 2.3.9
- 3.1
- 3.1.0
- 3.1.1
@@ -101,9 +104,9 @@ export HADOOP_CLASSPATH=`hadoop classpath`
下表列出了所有可用的 Hive jar。您可以选择一个并放在 Flink 发行版的`/lib/` 目录中。
-| Metastore version | Maven dependency | SQL Client JAR |
-| :---------------- | :--------------------------- | :----------------------|
-| 2.3.0 - 2.3.6 | `flink-sql-connector-hive-2.3.6` | {{< stable
>}}[Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-hive-2.3.6{{<
scala_version >}}/{{< version >}}/flink-sql-connector-hive-2.3.6{{<
scala_version >}}-{{< version >}}.jar) {{< /stable >}}{{< unstable >}} Only
available for stable releases {{< /unstable >}} |
+| Metastore version | Maven dependency | SQL Client JAR
|
+|:------------------|:---------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 2.3.0 - 2.3.9 | `flink-sql-connector-hive-2.3.9` | {{< stable
>}}[Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-hive-2.3.9{{<
scala_version >}}/{{< version >}}/flink-sql-connector-hive-2.3.9{{<
scala_version >}}-{{< version >}}.jar) {{< /stable >}}{{< unstable >}} Only
available for stable releases {{< /unstable >}} |
| 3.0.0 - 3.1.2 | `flink-sql-connector-hive-3.1.2` | {{< stable
>}}[Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-hive-3.1.2{{<
scala_version >}}/{{< version >}}/flink-sql-connector-hive-3.1.2{{<
scala_version >}}-{{< version >}}.jar) {{< /stable >}}{{< unstable >}} Only
available for stable releases {{< /unstable >}} |
#### 用户定义的依赖项
diff --git a/docs/content/docs/connectors/table/hive/overview.md
b/docs/content/docs/connectors/table/hive/overview.md
index f44a07d7b23..b87766cbccd 100644
--- a/docs/content/docs/connectors/table/hive/overview.md
+++ b/docs/content/docs/connectors/table/hive/overview.md
@@ -69,6 +69,9 @@ Flink supports the following Hive versions.
- 2.3.4
- 2.3.5
- 2.3.6
+ - 2.3.7
+ - 2.3.8
+ - 2.3.9
- 3.1
- 3.1.0
- 3.1.1
@@ -103,9 +106,9 @@ There are two ways to add Hive dependencies. First is to
use Flink's bundled Hiv
The following tables list all available bundled hive jars. You can pick one to
the `/lib/` directory in Flink distribution.
-| Metastore version | Maven dependency | SQL Client JAR |
-| :---------------- | :--------------------------- | :----------------------|
-| 2.3.0 - 2.3.6 | `flink-sql-connector-hive-2.3.6` | {{< stable
>}}[Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-hive-2.3.6{{<
scala_version >}}/{{< version >}}/flink-sql-connector-hive-2.3.6{{<
scala_version >}}-{{< version >}}.jar) {{< /stable >}}{{< unstable >}} Only
available for stable releases {{< /unstable >}} |
+| Metastore version | Maven dependency | SQL Client JAR
|
+|:------------------|:---------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 2.3.0 - 2.3.9 | `flink-sql-connector-hive-2.3.9` | {{< stable
>}}[Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-hive-2.3.9{{<
scala_version >}}/{{< version >}}/flink-sql-connector-hive-2.3.9{{<
scala_version >}}-{{< version >}}.jar) {{< /stable >}}{{< unstable >}} Only
available for stable releases {{< /unstable >}} |
| 3.0.0 - 3.1.2 | `flink-sql-connector-hive-3.1.2` | {{< stable
>}}[Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-hive-3.1.2{{<
scala_version >}}/{{< version >}}/flink-sql-connector-hive-3.1.2{{<
scala_version >}}-{{< version >}}.jar) {{< /stable >}}{{< unstable >}} Only
available for stable releases {{< /unstable >}} |
#### User defined dependencies
diff --git a/flink-connectors/flink-connector-hive/pom.xml
b/flink-connectors/flink-connector-hive/pom.xml
index 6fa6c427713..1bb96597fbb 100644
--- a/flink-connectors/flink-connector-hive/pom.xml
+++ b/flink-connectors/flink-connector-hive/pom.xml
@@ -1027,15 +1027,15 @@ under the License.
<profiles>
<!-- Activate these profiles with -Phive-x.x.x to build and
test against different Hive versions -->
<profile>
- <id>hive-2.3.6</id>
+ <id>hive-2.3.9</id>
<properties>
- <hive.version>2.3.6</hive.version>
+ <hive.version>2.3.9</hive.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
-
<version>${hive-2.3.6-orc-version}</version>
+
<version>${hive-2.3.9-orc-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
diff --git
a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveRunnerShimLoader.java
b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveRunnerShimLoader.java
index a70efe9e60a..7dfc6f1dafd 100644
---
a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveRunnerShimLoader.java
+++
b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveRunnerShimLoader.java
@@ -44,6 +44,8 @@ public class HiveRunnerShimLoader {
case HiveShimLoader.HIVE_VERSION_V2_3_5:
case HiveShimLoader.HIVE_VERSION_V2_3_6:
case HiveShimLoader.HIVE_VERSION_V2_3_7:
+ case HiveShimLoader.HIVE_VERSION_V2_3_8:
+ case HiveShimLoader.HIVE_VERSION_V2_3_9:
case HiveShimLoader.HIVE_VERSION_V3_1_0:
case HiveShimLoader.HIVE_VERSION_V3_1_1:
case HiveShimLoader.HIVE_VERSION_V3_1_2:
diff --git a/flink-connectors/flink-sql-connector-hive-2.3.6/pom.xml
b/flink-connectors/flink-sql-connector-hive-2.3.9/pom.xml
similarity index 95%
rename from flink-connectors/flink-sql-connector-hive-2.3.6/pom.xml
rename to flink-connectors/flink-sql-connector-hive-2.3.9/pom.xml
index a10bce91a1c..293d61c1561 100644
--- a/flink-connectors/flink-sql-connector-hive-2.3.6/pom.xml
+++ b/flink-connectors/flink-sql-connector-hive-2.3.9/pom.xml
@@ -30,8 +30,8 @@ under the License.
<relativePath>..</relativePath>
</parent>
-
<artifactId>flink-sql-connector-hive-2.3.6_${scala.binary.version}</artifactId>
- <name>Flink : Connectors : SQL : Hive 2.3.6</name>
+
<artifactId>flink-sql-connector-hive-2.3.9_${scala.binary.version}</artifactId>
+ <name>Flink : Connectors : SQL : Hive 2.3.9</name>
<packaging>jar</packaging>
@@ -45,7 +45,7 @@ under the License.
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
- <version>2.3.6</version>
+ <version>2.3.9</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
diff --git
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/NOTICE
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/NOTICE
similarity index 81%
rename from
flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/NOTICE
rename to
flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/NOTICE
index 5285c015759..276e7f1c9a8 100644
---
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/NOTICE
+++
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-flink-sql-connector-hive-2.3.6
+flink-sql-connector-hive-2.3.9
Copyright 2014-2021 The Apache Software Foundation
This product includes software developed at
@@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software
License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- org.apache.hive:hive-exec:2.3.6
+- org.apache.hive:hive-exec:2.3.9
This project bundles the following dependencies under the BSD license.
See bundled license files for details.
@@ -27,16 +27,16 @@ the Apache Software License 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
- org.apache.avro:avro-mapred:1.7.7
- org.apache.avro:avro:1.7.7
- org.apache.commons:commons-lang3:3.1
-- org.apache.hive.shims:hive-shims-0.23:2.3.6
-- org.apache.hive.shims:hive-shims-common:2.3.6
-- org.apache.hive:hive-common:2.3.6
-- org.apache.hive:hive-llap-client:2.3.6
-- org.apache.hive:hive-llap-common:2.3.6
-- org.apache.hive:hive-metastore:2.3.6
-- org.apache.hive:hive-serde:2.3.6
-- org.apache.hive:hive-service-rpc:2.3.6
+- org.apache.hive.shims:hive-shims-0.23:2.3.9
+- org.apache.hive.shims:hive-shims-common:2.3.9
+- org.apache.hive:hive-common:2.3.9
+- org.apache.hive:hive-llap-client:2.3.9
+- org.apache.hive:hive-llap-common:2.3.9
+- org.apache.hive:hive-metastore:2.3.9
+- org.apache.hive:hive-serde:2.3.9
+- org.apache.hive:hive-service-rpc:2.3.9
- org.apache.hive:hive-storage-api:2.4.0
-- org.apache.hive:spark-client:2.3.6
+- org.apache.hive:spark-client:2.3.9
- org.apache.orc:orc-core:1.3.4
- org.apache.orc:orc-tools:1.3.4
- org.apache.parquet:parquet-hadoop-bundle:1.8.1
diff --git
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.antlr
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.antlr
similarity index 100%
rename from
flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.antlr
rename to
flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.antlr
diff --git
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.javolution
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.javolution
similarity index 100%
rename from
flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.javolution
rename to
flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.javolution
diff --git
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.jodd
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.jodd
similarity index 100%
rename from
flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.jodd
rename to
flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.jodd
diff --git
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.kryo
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.kryo
similarity index 100%
rename from
flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.kryo
rename to
flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.kryo
diff --git
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.minlog
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.minlog
similarity index 100%
rename from
flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.minlog
rename to
flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.minlog
diff --git
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.protobuf
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.protobuf
similarity index 100%
rename from
flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.protobuf
rename to
flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.protobuf
diff --git
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.reflectasm
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.reflectasm
similarity index 100%
rename from
flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.reflectasm
rename to
flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.reflectasm
diff --git
a/flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.slf4j-api
b/flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.slf4j-api
similarity index 100%
rename from
flink-connectors/flink-sql-connector-hive-2.3.6/src/main/resources/META-INF/licenses/LICENSE.slf4j-api
rename to
flink-connectors/flink-sql-connector-hive-2.3.9/src/main/resources/META-INF/licenses/LICENSE.slf4j-api
diff --git a/flink-connectors/pom.xml b/flink-connectors/pom.xml
index dcf85fbf2c4..86dc7871664 100644
--- a/flink-connectors/pom.xml
+++ b/flink-connectors/pom.xml
@@ -98,7 +98,7 @@ under the License.
<module>flink-sql-connector-elasticsearch7</module>
<module>flink-sql-connector-hbase-1.4</module>
<module>flink-sql-connector-hbase-2.2</module>
- <module>flink-sql-connector-hive-2.3.6</module>
+ <module>flink-sql-connector-hive-2.3.9</module>
<module>flink-sql-connector-hive-3.1.2</module>
<module>flink-sql-connector-kafka</module>
<module>flink-sql-connector-aws-kinesis-streams</module>
diff --git a/pom.xml b/pom.xml
index 6e3b0f90b9e..3789324b9e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@ under the License.
-->
<minikdc.version>3.2.0</minikdc.version>
<hive.version>2.3.4</hive.version>
- <hive-2.2.0-orc-version>1.4.3</hive-2.2.0-orc-version>
+ <hive-2.3.9-orc-version>1.4.3</hive-2.3.9-orc-version>
<orc.version>1.5.6</orc.version>
<!--
Hive 2.3.4 relies on Hadoop 2.7.2 and later versions.
diff --git
a/tools/ci/java-ci-tools/src/main/resources/modules-defining-excess-dependencies.modulelist
b/tools/ci/java-ci-tools/src/main/resources/modules-defining-excess-dependencies.modulelist
index d866af5e421..5aedadf3764 100644
---
a/tools/ci/java-ci-tools/src/main/resources/modules-defining-excess-dependencies.modulelist
+++
b/tools/ci/java-ci-tools/src/main/resources/modules-defining-excess-dependencies.modulelist
@@ -19,7 +19,7 @@
# This file lists modules which define additional dependencies, not shown by
the maven shade plugin output.
# These are usually undeclared shaded (or otherwise included) dependencies
from transitive dependencies.
-flink-sql-connector-hive-2.3.6
+flink-sql-connector-hive-2.3.9
flink-sql-connector-hive-3.1.2
flink-sql-connector-hbase-1.4
flink-sql-connector-hbase-2.2
