This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new b4e0981 [IOTDB-761]cherry-picked from v0.10: flink-tsfile-connecto
and flink-example dependency conflict: "Some Enforcer rules have failed. Look
above for specific messages explaining why the rule failed" (#1365)
b4e0981 is described below
commit b4e09813b008b03c4d6cdce0605b82bce8e4a466
Author: Xiangdong Huang <[email protected]>
AuthorDate: Thu Jun 18 21:01:08 2020 +0800
[IOTDB-761]cherry-picked from v0.10: flink-tsfile-connecto and
flink-example dependency conflict: "Some Enforcer rules have failed. Look above
for specific messages explaining why the rule failed" (#1365)
* fix Dependency convergence error in flink-tsfile-connector
---
example/flink/pom.xml | 8 ++++++++
flink-tsfile-connector/pom.xml | 23 +++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/example/flink/pom.xml b/example/flink/pom.xml
index 308edfb..94f9ad5 100644
--- a/example/flink/pom.xml
+++ b/example/flink/pom.xml
@@ -35,6 +35,14 @@
<groupId>org.apache.iotdb</groupId>
<artifactId>flink-iotdb-connector</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <!-- org.apache.iotdb:hadoop-tsfile uses hadoop-common:2.7.3,
which uses commons-compress:1.4.1-->
+ <!-- flink-java uses commons-compress:1.18-->
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
diff --git a/flink-tsfile-connector/pom.xml b/flink-tsfile-connector/pom.xml
index 3879873..c18aa91 100644
--- a/flink-tsfile-connector/pom.xml
+++ b/flink-tsfile-connector/pom.xml
@@ -39,16 +39,39 @@
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <!-- flink-java uses commons-math3:3.3.5 while hadoop uses
3.1.1-->
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${flink.version}</version>
+ <exclusions>
+ <!-- org.apache.iotdb:hadoop-tsfile uses hadoop-common:2.7.3,
which uses commons-compress:1.4.1-->
+ <!-- flink-java uses commons-compress:1.18-->
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_2.11</artifactId>
<version>${flink.version}</version>
+ <exclusions>
+ <!-- org.apache.iotdb:hadoop-tsfile uses hadoop-common:2.7.3,
which uses commons-compress:1.4.1-->
+ <!-- flink-java uses commons-compress:1.18-->
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>