This is an automated email from the ASF dual-hosted git repository.
rmetzger pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.11 by this push:
new 2f4956f [FLINK-18256][orc] Exclude ORC's Hadoop dependency and pull
in provided vanilla hadoop in flink-orc
2f4956f is described below
commit 2f4956f715d97a1fa474e470517b25300f78cdcf
Author: wangyang0918 <[email protected]>
AuthorDate: Thu Jun 11 19:36:25 2020 +0800
[FLINK-18256][orc] Exclude ORC's Hadoop dependency and pull in provided
vanilla hadoop in flink-orc
---
flink-formats/flink-orc/pom.xml | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/flink-formats/flink-orc/pom.xml b/flink-formats/flink-orc/pom.xml
index 510ac4e..7371124 100644
--- a/flink-formats/flink-orc/pom.xml
+++ b/flink-formats/flink-orc/pom.xml
@@ -75,6 +75,15 @@ under the License.
<artifactId>orc-core</artifactId>
<version>${orc.version}</version>
<exclusions>
+ <!-- Exclude ORC's Hadoop dependency and pull
in provided vanilla hadoop. -->
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
@@ -92,6 +101,18 @@ under the License.
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
