This is an automated email from the ASF dual-hosted git repository.
snuyanzin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-hive.git
commit e9b15d59aea34e7019b964272642618dd4444cf8
Author: Sergey Nuyanzin <snuyan...@gmail.com>
AuthorDate: Sat Jan 11 22:10:20 2025 +0100
[hotfix] Dependency convergence
---
flink-connector-hive/pom.xml | 13 ++++++++++++-
flink-sql-connector-hive-2.3.10/pom.xml | 4 ++++
.../src/main/resources/META-INF/NOTICE | 3 +--
flink-sql-connector-hive-3.1.3/pom.xml | 10 ++++++++++
4 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/flink-connector-hive/pom.xml b/flink-connector-hive/pom.xml
index 924b0780..23c480eb 100644
--- a/flink-connector-hive/pom.xml
+++ b/flink-connector-hive/pom.xml
@@ -151,6 +151,10 @@ under the License.
<groupId>org.pentaho</groupId>
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
</exclusion>
+ <exclusion>
+
<groupId>org.apache.thrift</groupId>
+
<artifactId>libthrift</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -377,6 +381,10 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -991,6 +999,10 @@ under the License.
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1413,7 +1425,6 @@ under the License.
<activation>
<jdk>[11,)</jdk>
</activation>
-
<build>
<plugins>
<plugin>
diff --git a/flink-sql-connector-hive-2.3.10/pom.xml
b/flink-sql-connector-hive-2.3.10/pom.xml
index f5260a95..f4322145 100644
--- a/flink-sql-connector-hive-2.3.10/pom.xml
+++ b/flink-sql-connector-hive-2.3.10/pom.xml
@@ -108,6 +108,10 @@ under the License.
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/flink-sql-connector-hive-2.3.10/src/main/resources/META-INF/NOTICE
b/flink-sql-connector-hive-2.3.10/src/main/resources/META-INF/NOTICE
index ececff1c..cb65e092 100644
--- a/flink-sql-connector-hive-2.3.10/src/main/resources/META-INF/NOTICE
+++ b/flink-sql-connector-hive-2.3.10/src/main/resources/META-INF/NOTICE
@@ -49,8 +49,7 @@ the Apache Software License 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
- 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
-- org.apache.thrift:libthrift:0.7.0
-- org.apache.thrift:libthrift:0.9.3
+- org.apache.thrift:libthrift:0.14.1
- org.apache.thrift:libfb303:0.9.3
- org.codehaus.jackson:jackson-core-asl:1.9.11
- org.codehaus.jackson:jackson-core-asl:1.9.13
diff --git a/flink-sql-connector-hive-3.1.3/pom.xml
b/flink-sql-connector-hive-3.1.3/pom.xml
index ad312d5f..e28ee5ad 100644
--- a/flink-sql-connector-hive-3.1.3/pom.xml
+++ b/flink-sql-connector-hive-3.1.3/pom.xml
@@ -181,6 +181,10 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -188,6 +192,12 @@ under the License.
<groupId>org.apache.thrift</groupId>
<artifactId>libfb303</artifactId>
<version>0.9.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- avro is included in hive-exec. we use the same
dependencies but with a different version -->
