You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/08/12 00:10:34 UTC
[1/3] storm git commit: resolve calcite dependency conflict
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 <aa...@target.com>
Authored: Tue Jun 30 14:49:38 2015 -0500
Committer: Aaron Dossett <aa...@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>
[3/3] storm git commit: add STORM-944 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-944 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c54cea11
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c54cea11
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c54cea11
Branch: refs/heads/master
Commit: c54cea116c33853c265d5f3c4eae2129e995b40d
Parents: 6dba1d6
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Aug 12 07:10:15 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Aug 12 07:10:15 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c54cea11/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19e3cd9..b1d8293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
* STORM-913: Use Curator's delete().deletingChildrenIfNeeded() instead of zk/delete-recursive
* STORM-968: Adding support to generate the id based on names in Trident
* STORM-845: Storm ElasticSearch connector
+ * STORM-944: storm-hive pom.xml has a dependency conflict with calcite
## 0.10.0-beta2
* STORM-843: [storm-redis] Add Javadoc to storm-redis
[2/3] storm git commit: Merge branch 'HivePom' of
https://github.com/dossett/storm into STORM-944
Posted by ka...@apache.org.
Merge branch 'HivePom' of https://github.com/dossett/storm into STORM-944
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6dba1d69
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6dba1d69
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6dba1d69
Branch: refs/heads/master
Commit: 6dba1d694ca861a6be90dc650fb2ae6600bcb891
Parents: 544e55c e30bcfd
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Aug 12 07:08:58 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Aug 12 07:08:58 2015 +0900
----------------------------------------------------------------------
external/storm-hive/pom.xml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------