[flink] branch master updated: [FLINK-22920][formats] Fix guava version conflict between calcite and hadoop component. (#19965)

[jark]

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

jark 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 fd0d1298d4f [FLINK-22920][formats] Fix guava version conflict between 
calcite and hadoop component. (#19965)
fd0d1298d4f is described below

commit fd0d1298d4f447afd42de80124a853855f20fccb
Author: Jia Liu <liujiawi...@gmail.com>
AuthorDate: Fri Jun 17 19:21:00 2022 +0800

    [FLINK-22920][formats] Fix guava version conflict between calcite and 
hadoop component. (#19965)
---
 flink-formats/flink-orc/pom.xml     | 12 ++++++++++++
 flink-formats/flink-parquet/pom.xml |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/flink-formats/flink-orc/pom.xml b/flink-formats/flink-orc/pom.xml
index 1306f3eea30..94979e398d2 100644
--- a/flink-formats/flink-orc/pom.xml
+++ b/flink-formats/flink-orc/pom.xml
@@ -99,12 +99,24 @@ under the License.
                        <groupId>org.apache.hadoop</groupId>
                        <artifactId>hadoop-common</artifactId>
                        <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.google.guava</groupId>
+                                       <artifactId>guava</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
 
                <dependency>
                        <groupId>org.apache.hadoop</groupId>
                        <artifactId>hadoop-hdfs</artifactId>
                        <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.google.guava</groupId>
+                                       <artifactId>guava</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
 
                <!-- Tests -->
diff --git a/flink-formats/flink-parquet/pom.xml 
b/flink-formats/flink-parquet/pom.xml
index f3aac38595e..82d96943364 100644
--- a/flink-formats/flink-parquet/pom.xml
+++ b/flink-formats/flink-parquet/pom.xml
@@ -97,6 +97,10 @@ under the License.
                                        <groupId>com.google.protobuf</groupId>
                                        <artifactId>protobuf-java</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>com.google.guava</groupId>
+                                       <artifactId>guava</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
 
@@ -109,6 +113,10 @@ under the License.
                                        <groupId>com.google.protobuf</groupId>
                                        <artifactId>protobuf-java</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>com.google.guava</groupId>
+                                       <artifactId>guava</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>