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 ba9af5fbbf7 [FLINK-27450][hive] Upgrade default hive version to fix
Hive SessionState initialization issue with jdk11
ba9af5fbbf7 is described below
commit ba9af5fbbf7eb755b0ee564a9715131d2fc6e943
Author: Tartarus0zm <zhangma...@163.com>
AuthorDate: Wed May 11 11:36:59 2022 +0800
[FLINK-27450][hive] Upgrade default hive version to fix Hive SessionState
initialization issue with jdk11
---
flink-connectors/flink-connector-hive/pom.xml | 19 -------------------
.../flink/table/module/hive/HiveModuleTest.java | 4 ++--
flink-table/flink-sql-client/pom.xml | 4 ++++
pom.xml | 3 +--
4 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/flink-connectors/flink-connector-hive/pom.xml
b/flink-connectors/flink-connector-hive/pom.xml
index ea37cd5e167..bba4b5374ee 100644
--- a/flink-connectors/flink-connector-hive/pom.xml
+++ b/flink-connectors/flink-connector-hive/pom.xml
@@ -1023,25 +1023,6 @@ 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.9</id>
- <properties>
- <hive.version>2.3.9</hive.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.orc</groupId>
- <artifactId>orc-core</artifactId>
-
<version>${hive-2.3.9-orc-version}</version>
- <exclusions>
- <exclusion>
-
<groupId>org.apache.hadoop</groupId>
-
<artifactId>hadoop-common</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>hive-3.1.1</id>
<properties>
diff --git
a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java
b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java
index 3a4f4bb8251..fe5b87d91c3 100644
---
a/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java
+++
b/flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/table/module/hive/HiveModuleTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import java.util.List;
-import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VERSION_V2_3_4;
+import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VERSION_V2_3_9;
import static
org.apache.flink.table.catalog.hive.client.HiveShimLoader.HIVE_VERSION_V3_1_1;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -73,7 +73,7 @@ public class HiveModuleTest {
private void verifyNumBuiltInFunctions(String hiveVersion, HiveModule
hiveModule) {
switch (hiveVersion) {
- case HIVE_VERSION_V2_3_4:
+ case HIVE_VERSION_V2_3_9:
assertEquals(275, hiveModule.listFunctions().size());
break;
case HIVE_VERSION_V3_1_1:
diff --git a/flink-table/flink-sql-client/pom.xml
b/flink-table/flink-sql-client/pom.xml
index 957362281ee..3207e7b47dd 100644
--- a/flink-table/flink-sql-client/pom.xml
+++ b/flink-table/flink-sql-client/pom.xml
@@ -420,6 +420,10 @@ under the License.
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index 91db75c42a3..29675294538 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,8 +149,7 @@ under the License.
to revisit the impact at that time.
-->
<minikdc.version>3.2.0</minikdc.version>
- <hive.version>2.3.4</hive.version>
- <hive-2.3.9-orc-version>1.4.3</hive-2.3.9-orc-version>
+ <hive.version>2.3.9</hive.version>
<orc.version>1.5.6</orc.version>
<!--
Hive 2.3.4 relies on Hadoop 2.7.2 and later versions.
