Repository: storm Updated Branches: refs/heads/0.10.x-branch 59bbcd3aa -> e378dbef4
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/9b89cf0a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9b89cf0a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9b89cf0a Branch: refs/heads/0.10.x-branch Commit: 9b89cf0a0e418ad243f88c527577f0c4886bf8e0 Parents: 59bbcd3 Author: Aaron Dossett <[email protected]> Authored: Tue Jun 30 14:49:38 2015 -0500 Committer: Jungtaek Lim <[email protected]> Committed: Fri Sep 4 06:11:01 2015 +0900 ---------------------------------------------------------------------- external/storm-hive/pom.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/9b89cf0a/external/storm-hive/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-hive/pom.xml b/external/storm-hive/pom.xml index 406bc21..731abe2 100644 --- a/external/storm-hive/pom.xml +++ b/external/storm-hive/pom.xml @@ -52,6 +52,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> @@ -64,6 +72,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> @@ -75,6 +91,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>
