You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ja...@apache.org on 2018/02/07 07:02:39 UTC
eagle git commit: [EAGLE-1083] Upgrade Storm to 0.9.7
Repository: eagle
Updated Branches:
refs/heads/master eaef3d6eb -> b51453857
[EAGLE-1083] Upgrade Storm to 0.9.7
<!--
{% comment %}
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to you under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
{% endcomment %}
-->
Be sure to do all of the following to help us incorporate your contribution
quickly and easily:
- [ ] Make sure the PR title is formatted like:
`[EAGLE-<Jira issue #>] Description of pull request`
- [ ] Make sure tests pass via `mvn clean verify`. (Even better, enable
Travis-CI on your fork and ensure the whole test matrix passes).
- [ ] Replace `<Jira issue #>` in the title with the actual Jira issue
number, if there is one.
- [ ] If this contribution is large, please file an Apache
[Individual Contributor License Agreement](https://www.apache.org/licenses/icla.txt).
---
Author: Colm O hEigeartaigh <co...@apache.org>
Closes #987 from coheigea/EAGLE-1083.
Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/b5145385
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/b5145385
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/b5145385
Branch: refs/heads/master
Commit: b51453857c75398f024c5a18ea97f904e239442b
Parents: eaef3d6
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 6 23:02:32 2018 -0800
Committer: Jay Sen <js...@paypal.com>
Committed: Tue Feb 6 23:02:32 2018 -0800
----------------------------------------------------------------------
eagle-core/eagle-alert-parent/eagle-alert/pom.xml | 2 +-
eagle-core/eagle-data-process/pom.xml | 2 +-
pom.xml | 15 +++------------
3 files changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/eagle/blob/b5145385/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
index 2b98abd..f387ea8 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/pom.xml
@@ -199,7 +199,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
+ <version>${kafka.version}</version>
<!--<scope>test</scope> -->
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/eagle/blob/b5145385/eagle-core/eagle-data-process/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-data-process/pom.xml b/eagle-core/eagle-data-process/pom.xml
index f6202fb..4087497 100644
--- a/eagle-core/eagle-data-process/pom.xml
+++ b/eagle-core/eagle-data-process/pom.xml
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
+ <version>${kafka.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/eagle/blob/b5145385/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 079385a..3c777b4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -191,8 +191,6 @@
<spark.core.version>1.4.0</spark.core.version>
- <!-- Client -->
- <!--<kafka-client.version>0.9.0.0</kafka-client.version>-->
<!-- Reflection -->
<reflections.version>0.9.8</reflections.version>
@@ -244,18 +242,11 @@
<jasypt.version>1.9.2</jasypt.version>
<!-- Streaming -->
- <!--<kafka.version>0.10.0.0</kafka.version>-->
<kafka.version>0.8.2.2</kafka.version>
- <kafka-clients.version>0.8.2.0</kafka-clients.version>
<kafka.artifact.id>kafka_2.11</kafka.artifact.id>
<jgrapht.version>0.9.0</jgrapht.version>
<storm-kafka.version>0.10.0</storm-kafka.version>
- <storm.version>0.9.3</storm.version>
-
- <mapr-kafka.version>0.9.0.0-mapr-1607</mapr-kafka.version>
- <mapr-kafka-clients.version>0.8.3-mapr-1509</mapr-kafka-clients.version>
- <mapr-storm-kafka.version>0.9.3</mapr-storm-kafka.version>
- <mapr-storm.version>0.9.3-mapr-1509</mapr-storm.version>
+ <storm.version>0.9.7</storm.version>
<curator.version>2.5.0</curator.version>
<curator.test.version>2.5.0</curator.test.version>
@@ -577,7 +568,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka-clients.version}</version>
+ <version>${kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
@@ -1056,7 +1047,7 @@
<dependency>
<groupId>org.apache.storm</groupId>
<artifactId>storm-kafka</artifactId>
- <version>${mapr-storm-kafka.version}</version>
+ <version>${storm.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>