storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [1/3] storm git commit: resolve calcite dependency conflict
Date Tue, 11 Aug 2015 22:10:34 GMT
Repository: storm
Updated Branches:
  refs/heads/master 544e55cb8 -> c54cea116


resolve calcite dependency conflict


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e30bcfdd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e30bcfdd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e30bcfdd

Branch: refs/heads/master
Commit: e30bcfdd1071cd1d3392afe0764554cfc86a2f50
Parents: 9579c0b
Author: Aaron Dossett <aaron.dossett@target.com>
Authored: Tue Jun 30 14:49:38 2015 -0500
Committer: Aaron Dossett <aaron.dossett@target.com>
Committed: Tue Jun 30 14:49:38 2015 -0500

----------------------------------------------------------------------
 external/storm-hive/pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e30bcfdd/external/storm-hive/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hive/pom.xml b/external/storm-hive/pom.xml
index e6eacd7..6fa4fa9 100644
--- a/external/storm-hive/pom.xml
+++ b/external/storm-hive/pom.xml
@@ -53,6 +53,14 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.calcite</groupId>
+          <artifactId>calcite-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.calcite</groupId>
+          <artifactId>calcite-avatica</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -65,6 +73,14 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.calcite</groupId>
+          <artifactId>calcite-avatica</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.calcite</groupId>
+          <artifactId>calcite-core</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -76,6 +92,14 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.calcite</groupId>
+          <artifactId>calcite-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.calcite</groupId>
+          <artifactId>calcite-avatica</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>


Mime
View raw message