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/11/08 14:33:17 UTC

[iotdb] 06/06: fix conflict

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

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

commit d0ef72fbd6eec646130370facb1a18e3d550e8c0
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Nov 8 17:12:36 2020 +0800

    fix conflict
---
 hadoop/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index 4b41771..6b33daa 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -59,13 +59,6 @@
             <artifactId>guava</artifactId>
             <version>21.0</version>
         </dependency>
-        <!-- many of hadoop dependencies use guava11, but org.apache.curator from hadoop-common uses
-        guava16 -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>16.0.1</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>