You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ha...@apache.org on 2016/07/08 04:02:23 UTC
incubator-eagle git commit: [EAGLE-359] Fix building problem caused
by #250 with invalid kafka version
Repository: incubator-eagle
Updated Branches:
refs/heads/develop 72a1501c3 -> 160f674cd
[EAGLE-359] Fix building problem caused by #250 with invalid kafka version
https://issues.apache.org/jira/browse/EAGLE-359
Author: Hao Chen <ha...@apache.org>
Closes #254 from haoch/EAGLE-359.
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/160f674c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/160f674c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/160f674c
Branch: refs/heads/develop
Commit: 160f674cd17f5530e08524179c2bf1ea83090ccf
Parents: 72a1501
Author: Hao Chen <ha...@apache.org>
Authored: Fri Jul 8 12:02:13 2016 +0800
Committer: Hao Chen <ha...@apache.org>
Committed: Fri Jul 8 12:02:13 2016 +0800
----------------------------------------------------------------------
.../apache/eagle/alert/engine/spout/CreateTopicUtils.java | 10 +++-------
pom.xml | 8 ++------
2 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/160f674c/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/CreateTopicUtils.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/CreateTopicUtils.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/CreateTopicUtils.java
index 7e0dd3f..5f43d11 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/CreateTopicUtils.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/spout/CreateTopicUtils.java
@@ -21,9 +21,7 @@ package org.apache.eagle.alert.engine.spout;
import java.util.Properties;
import kafka.admin.AdminUtils;
-import kafka.admin.RackAwareMode;
import kafka.utils.ZKStringSerializer$;
-import kafka.utils.ZkUtils;
import org.I0Itec.zkclient.ZkClient;
import org.I0Itec.zkclient.ZkConnection;
@@ -42,13 +40,11 @@ public class CreateTopicUtils {
public static void ensureTopicReady(String zkQuorum, String topic) {
ZkConnection zkConnection = new ZkConnection(zkQuorum);
ZkClient zkClient = new ZkClient(zkQuorum, 10000, 10000, ZKStringSerializer$.MODULE$);
- ZkUtils zkUtils = new ZkUtils(zkClient, zkConnection, false);
- if (!AdminUtils.topicExists(zkUtils, topic)) {
+// ZkUtils zkUtils = new ZkUtils(zkClient, zkConnection, false);
+ if (!AdminUtils.topicExists(zkClient, topic)) {
LOG.info("create topic " + topic + " with partitions " + partitions + ", and replicationFactor "
+ replicationFactor);
- AdminUtils.createTopic(zkUtils, topic, partitions, replicationFactor, new Properties(),
- RackAwareMode.Disabled$.MODULE$);
+ AdminUtils.createTopic(zkClient, topic, partitions, replicationFactor, new Properties());
}
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/160f674c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e240c8a..d6a005f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,6 @@
<organizationUrl>https://eagle.incubator.apache.org</organizationUrl>
</developer>
</developers>
-
<modules>
<module>eagle-core</module>
<module>eagle-webservice</module>
@@ -223,7 +222,8 @@
<asm.version>5.0</asm.version>
<!-- Streaming -->
- <kafka.version>0.10.0.0</kafka.version>
+ <!--<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>
@@ -298,12 +298,8 @@
<!-- dropwizard -->
<dropwizard.version>0.7.1</dropwizard.version>
-
</properties>
-
-
-
<dependencyManagement>
<dependencies>
<!-- Commons Dependencies-->