You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by da...@apache.org on 2022/11/08 08:17:07 UTC

[flink] branch master updated: [FLINK-29878][hive] Fix flink-sql-connector hive error

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

dannycranmer 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 a77747892b1 [FLINK-29878][hive] Fix flink-sql-connector hive error
a77747892b1 is described below

commit a77747892b1724fa5ec388c2b0fe519db32664e9
Author: Samrat002 <db...@3c22fba1b03f.ant.amazon.com>
AuthorDate: Fri Nov 4 23:35:48 2022 +0530

    [FLINK-29878][hive] Fix flink-sql-connector hive error
---
 flink-connectors/flink-sql-connector-hive-3.1.3/pom.xml        | 10 ++++++++--
 .../src/main/resources/META-INF/NOTICE                         |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/flink-connectors/flink-sql-connector-hive-3.1.3/pom.xml b/flink-connectors/flink-sql-connector-hive-3.1.3/pom.xml
index 10a4c3c6235..87e9fbb3f1a 100644
--- a/flink-connectors/flink-sql-connector-hive-3.1.3/pom.xml
+++ b/flink-connectors/flink-sql-connector-hive-3.1.3/pom.xml
@@ -101,6 +101,12 @@ under the License.
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.thrift</groupId>
+			<artifactId>libfb303</artifactId>
+			<version>0.9.3</version>
+		</dependency>
+
 		<!-- avro is included in hive-exec. we use the same dependencies but with a different version -->
 		<dependency>
 			<groupId>org.apache.avro</groupId>
@@ -151,8 +157,8 @@ under the License.
 										<exclude>avro/shaded/com/google/**</exclude>
 										<exclude>org/apache/avro/**</exclude>
 										<exclude>META-INF/maven/org.apache.avro/**</exclude>
-										<exclude>org/apache/hadoop/hive/conf/HiveConf*</exclude>
-										<exclude>org/apache/hadoop/hive/metastore/HiveMetaStoreClient*</exclude>
+										<exclude>org/apache/hadoop/hive/conf/HiveConf.class</exclude>
+										<exclude>org/apache/hadoop/hive/metastore/HiveMetaStoreClient.class</exclude>
 									</excludes>
 								</filter>
 							</filters>
diff --git a/flink-connectors/flink-sql-connector-hive-3.1.3/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-sql-connector-hive-3.1.3/src/main/resources/META-INF/NOTICE
index f87c73fba38..0a94ab7c005 100644
--- a/flink-connectors/flink-sql-connector-hive-3.1.3/src/main/resources/META-INF/NOTICE
+++ b/flink-connectors/flink-sql-connector-hive-3.1.3/src/main/resources/META-INF/NOTICE
@@ -9,6 +9,7 @@ This project bundles the following dependencies under the Apache Software Licens
 - org.apache.avro:avro-mapred:hadoop2:1.8.2
 - org.apache.avro:avro:1.8.2
 - org.apache.hive:hive-exec:3.1.3
+- org.apache.thrift:libthrift:0.9.3
 
 This project bundles the following dependencies under the BSD license.
 See bundled license files for details.
@@ -42,7 +43,6 @@ the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 - org.apache.orc:orc-shims:1.5.8
 - org.apache.orc:orc-tools:1.5.8
 - org.apache.parquet:parquet-hadoop-bundle:1.10.0
-- org.apache.thrift:libthrift:0.9.3
 - org.codehaus.jackson:jackson-core-asl:1.9.13
 - org.codehaus.jackson:jackson-mapper-asl:1.9.13
 - org.objenesis:objenesis:2.1