You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/05/20 21:47:25 UTC
[1/3] git commit: curator-1.3.3 -> curator-2.4.0
Repository: incubator-storm
Updated Branches:
refs/heads/master 4ee9ea7a8 -> b5903d22b
curator-1.3.3 -> curator-2.4.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/b1bb394c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/b1bb394c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/b1bb394c
Branch: refs/heads/master
Commit: b1bb394c61fd52e40731500ce3311c8a26f718e7
Parents: 5df89d5
Author: thinker0 <th...@gmail.com>
Authored: Wed May 14 21:56:48 2014 +0900
Committer: thinker0 <th...@gmail.com>
Committed: Wed May 14 21:56:48 2014 +0900
----------------------------------------------------------------------
external/storm-kafka/pom.xml | 12 ++++++------
.../src/jvm/storm/kafka/DynamicBrokersReader.java | 6 +++---
external/storm-kafka/src/jvm/storm/kafka/ZkState.java | 6 +++---
.../src/test/storm/kafka/DynamicBrokersReaderTest.java | 10 +++++-----
.../src/test/storm/kafka/KafkaTestBroker.java | 12 ++++++------
.../src/test/storm/kafka/ZkCoordinatorTest.java | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b1bb394c/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 9385678..f7f763c 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -61,9 +61,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.netflix.curator</groupId>
+ <groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>1.3.3</version>
+ <version>${curator.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -76,9 +76,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.netflix.curator</groupId>
+ <groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>1.3.3</version>
+ <version>${curator.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -88,9 +88,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.netflix.curator</groupId>
+ <groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>1.3.3</version>
+ <version>${curator.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b1bb394c/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java b/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
index 5197862..11ca605 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
@@ -19,9 +19,9 @@ package storm.kafka;
import backtype.storm.Config;
import backtype.storm.utils.Utils;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.retry.RetryNTimes;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.RetryNTimes;
import org.json.simple.JSONValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b1bb394c/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/ZkState.java b/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
index 52585ef..ac96a87 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
@@ -19,9 +19,9 @@ package storm.kafka;
import backtype.storm.Config;
import backtype.storm.utils.Utils;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.retry.RetryNTimes;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.RetryNTimes;
import org.apache.zookeeper.CreateMode;
import org.json.simple.JSONValue;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b1bb394c/external/storm-kafka/src/test/storm/kafka/DynamicBrokersReaderTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/DynamicBrokersReaderTest.java b/external/storm-kafka/src/test/storm/kafka/DynamicBrokersReaderTest.java
index d03bab3..d20187e 100644
--- a/external/storm-kafka/src/test/storm/kafka/DynamicBrokersReaderTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/DynamicBrokersReaderTest.java
@@ -1,11 +1,11 @@
package storm.kafka;
import backtype.storm.Config;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.retry.ExponentialBackoffRetry;
-import com.netflix.curator.test.TestingServer;
-import com.netflix.curator.utils.ZKPaths;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.ExponentialBackoffRetry;
+import org.apache.curator.test.TestingServer;
+import org.apache.curator.utils.ZKPaths;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b1bb394c/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java b/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java
index 6966834..11266a4 100644
--- a/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java
+++ b/external/storm-kafka/src/test/storm/kafka/KafkaTestBroker.java
@@ -1,11 +1,11 @@
package storm.kafka;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.framework.imps.CuratorFrameworkState;
-import com.netflix.curator.retry.ExponentialBackoffRetry;
-import com.netflix.curator.test.InstanceSpec;
-import com.netflix.curator.test.TestingServer;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.framework.imps.CuratorFrameworkState;
+import org.apache.curator.retry.ExponentialBackoffRetry;
+import org.apache.curator.test.InstanceSpec;
+import org.apache.curator.test.TestingServer;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServerStartable;
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b1bb394c/external/storm-kafka/src/test/storm/kafka/ZkCoordinatorTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/storm/kafka/ZkCoordinatorTest.java b/external/storm-kafka/src/test/storm/kafka/ZkCoordinatorTest.java
index 2dd4d21..e37923d 100644
--- a/external/storm-kafka/src/test/storm/kafka/ZkCoordinatorTest.java
+++ b/external/storm-kafka/src/test/storm/kafka/ZkCoordinatorTest.java
@@ -1,7 +1,7 @@
package storm.kafka;
import backtype.storm.Config;
-import com.netflix.curator.test.TestingServer;
+import org.apache.curator.test.TestingServer;
import kafka.javaapi.consumer.SimpleConsumer;
import org.junit.After;
import org.junit.Before;
[3/3] git commit: STORM-318: update changelog
Posted by pt...@apache.org.
STORM-318: update changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/b5903d22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/b5903d22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/b5903d22
Branch: refs/heads/master
Commit: b5903d22b8608af0ff05ffe5054b775ff62f8c46
Parents: 115540e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue May 20 15:47:17 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue May 20 15:47:17 2014 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b5903d22/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2281408..3b84669 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-318: update storm-kafka to use apache curator-2.4.0
* STORM-303: storm-kafka reliability improvements
* STORM-233: Removed inline heartbeat to nimbus to avoid workers being killed when under heavy ZK load
* STORM-267: fix package name of LoggingMetricsConsumer in storm.yaml.example
[2/3] git commit: Merge branch 'feature/apache-curator' of
github.com:thinker0/incubator-storm
Posted by pt...@apache.org.
Merge branch 'feature/apache-curator' of github.com:thinker0/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/115540e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/115540e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/115540e8
Branch: refs/heads/master
Commit: 115540e8696c8b95bd0a4622e160e343e87dea0d
Parents: 4ee9ea7 b1bb394
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue May 20 15:29:25 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue May 20 15:29:25 2014 -0400
----------------------------------------------------------------------
external/storm-kafka/pom.xml | 12 ++++++------
.../src/jvm/storm/kafka/DynamicBrokersReader.java | 6 +++---
external/storm-kafka/src/jvm/storm/kafka/ZkState.java | 6 +++---
.../src/test/storm/kafka/DynamicBrokersReaderTest.java | 10 +++++-----
.../src/test/storm/kafka/KafkaTestBroker.java | 12 ++++++------
.../src/test/storm/kafka/ZkCoordinatorTest.java | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/115540e8/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/115540e8/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
----------------------------------------------------------------------