You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/06/15 09:53:26 UTC

[incubator-iotdb] branch iotdb-761 created (now a824274)

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

hxd pushed a change to branch iotdb-761
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


      at a824274  fix Dependency convergence error in flink-tsfile-connector

This branch includes the following new commits:

     new c5d076d  fix Dependency convergence error in flink-tsfile-connector
     new a4508f2  fix Dependency convergence error in flink-tsfile-connector
     new a824274  fix Dependency convergence error in flink-tsfile-connector

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[incubator-iotdb] 03/03: fix Dependency convergence error in flink-tsfile-connector

Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch iotdb-761
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit a82427438873748dc2850b06b8c9e26f0eccc1d7
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Jun 10 18:32:08 2020 +0800

    fix Dependency convergence error in flink-tsfile-connector
---
 example/flink/pom.xml | 8 ++++++++
 1 file changed, 8 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>


[incubator-iotdb] 01/03: fix Dependency convergence error in flink-tsfile-connector

Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch iotdb-761
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit c5d076de82aac8ec8fc08670c41cd79f59cdb30a
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Jun 10 17:48:22 2020 +0800

    fix Dependency convergence error in flink-tsfile-connector
---
 flink-tsfile-connector/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/flink-tsfile-connector/pom.xml b/flink-tsfile-connector/pom.xml
index 3879873..9120572 100644
--- a/flink-tsfile-connector/pom.xml
+++ b/flink-tsfile-connector/pom.xml
@@ -39,11 +39,26 @@
             <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>


[incubator-iotdb] 02/03: fix Dependency convergence error in flink-tsfile-connector

Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch iotdb-761
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit a4508f2cc666a1129cada6033b26d4f39c94cb71
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Jun 10 18:19:28 2020 +0800

    fix Dependency convergence error in flink-tsfile-connector
---
 flink-tsfile-connector/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/flink-tsfile-connector/pom.xml b/flink-tsfile-connector/pom.xml
index 9120572..c18aa91 100644
--- a/flink-tsfile-connector/pom.xml
+++ b/flink-tsfile-connector/pom.xml
@@ -64,6 +64,14 @@
             <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>