storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [1/4] git commit: STORM-252 Upgrade curator to 2.4.0.
Date Fri, 25 Apr 2014 15:44:35 GMT
Repository: incubator-storm
Updated Branches:
  refs/heads/master a14adf36d -> a9e5d54ab


STORM-252 Upgrade curator to 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/d68cd231
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/d68cd231
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/d68cd231

Branch: refs/heads/master
Commit: d68cd231a8d365a4ec3b7f873cbbf36d59951630
Parents: 6c82685
Author: Robert (Bobby) Evans <evans@yahoo-inc.com>
Authored: Tue Mar 4 23:10:43 2014 +0000
Committer: Robert (Bobby) Evans <evans@yahoo-inc.com>
Committed: Tue Mar 4 23:10:43 2014 +0000

----------------------------------------------------------------------
 pom.xml                                                        | 4 ++--
 storm-core/pom.xml                                             | 2 +-
 storm-core/src/clj/backtype/storm/zookeeper.clj                | 6 +++---
 .../backtype/storm/transactional/state/TransactionalState.java | 2 +-
 storm-core/src/jvm/backtype/storm/utils/Utils.java             | 6 +++---
 .../jvm/storm/trident/topology/state/TransactionalState.java   | 2 +-
 storm-core/test/clj/backtype/storm/utils_test.clj              | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d68cd231/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eee717e..deb784f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
         <commons-lang.version>2.5</commons-lang.version>
         <commons-exec.version>1.1</commons-exec.version>
         <clj-time.version>0.4.1</clj-time.version>
-        <curator.version>1.3.3</curator.version>
+        <curator.version>2.4.0</curator.version>
         <json-simple.version>1.1</json-simple.version>
         <ring.version>0.3.11</ring.version>
         <clojure.tools.logging.version>0.2.3</clojure.tools.logging.version>
@@ -317,7 +317,7 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>com.netflix.curator</groupId>
+                <groupId>org.apache.curator</groupId>
                 <artifactId>curator-framework</artifactId>
                 <version>${curator.version}</version>
                 <exclusions>

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d68cd231/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 3506f15..08f0388 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -109,7 +109,7 @@
 
 
         <dependency>
-            <groupId>com.netflix.curator</groupId>
+            <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d68cd231/storm-core/src/clj/backtype/storm/zookeeper.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/zookeeper.clj b/storm-core/src/clj/backtype/storm/zookeeper.clj
index 5e70cb1..ab3e0b2 100644
--- a/storm-core/src/clj/backtype/storm/zookeeper.clj
+++ b/storm-core/src/clj/backtype/storm/zookeeper.clj
@@ -14,9 +14,9 @@
 ;; See the License for the specific language governing permissions and
 ;; limitations under the License.
 (ns backtype.storm.zookeeper
-  (:import [com.netflix.curator.retry RetryNTimes])
-  (:import [com.netflix.curator.framework.api CuratorEvent CuratorEventType CuratorListener
UnhandledErrorListener])
-  (:import [com.netflix.curator.framework CuratorFramework CuratorFrameworkFactory])
+  (:import [org.apache.curator.retry RetryNTimes])
+  (:import [org.apache.curator.framework.api CuratorEvent CuratorEventType CuratorListener
UnhandledErrorListener])
+  (:import [org.apache.curator.framework CuratorFramework CuratorFrameworkFactory])
   (:import [org.apache.zookeeper ZooKeeper Watcher KeeperException$NoNodeException
             ZooDefs ZooDefs$Ids CreateMode WatchedEvent Watcher$Event Watcher$Event$KeeperState
             Watcher$Event$EventType KeeperException$NodeExistsException])

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d68cd231/storm-core/src/jvm/backtype/storm/transactional/state/TransactionalState.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/transactional/state/TransactionalState.java
b/storm-core/src/jvm/backtype/storm/transactional/state/TransactionalState.java
index d3b9d40..91fc666 100644
--- a/storm-core/src/jvm/backtype/storm/transactional/state/TransactionalState.java
+++ b/storm-core/src/jvm/backtype/storm/transactional/state/TransactionalState.java
@@ -21,7 +21,7 @@ import backtype.storm.Config;
 import backtype.storm.serialization.KryoValuesDeserializer;
 import backtype.storm.serialization.KryoValuesSerializer;
 import backtype.storm.utils.Utils;
-import com.netflix.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFramework;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d68cd231/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java b/storm-core/src/jvm/backtype/storm/utils/Utils.java
index 0e04728..1489de8 100644
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@ -23,9 +23,9 @@ import backtype.storm.generated.ComponentObject;
 import backtype.storm.generated.StormTopology;
 import clojure.lang.IFn;
 import clojure.lang.RT;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.retry.ExponentialBackoffRetry;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.ExponentialBackoffRetry;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d68cd231/storm-core/src/jvm/storm/trident/topology/state/TransactionalState.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/topology/state/TransactionalState.java b/storm-core/src/jvm/storm/trident/topology/state/TransactionalState.java
index ee141f9..5325137 100644
--- a/storm-core/src/jvm/storm/trident/topology/state/TransactionalState.java
+++ b/storm-core/src/jvm/storm/trident/topology/state/TransactionalState.java
@@ -20,7 +20,7 @@ package storm.trident.topology.state;
 
 import backtype.storm.Config;
 import backtype.storm.utils.Utils;
-import com.netflix.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFramework;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d68cd231/storm-core/test/clj/backtype/storm/utils_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/utils_test.clj b/storm-core/test/clj/backtype/storm/utils_test.clj
index 99bf7d1..1cd1bb4 100644
--- a/storm-core/test/clj/backtype/storm/utils_test.clj
+++ b/storm-core/test/clj/backtype/storm/utils_test.clj
@@ -16,7 +16,7 @@
 (ns backtype.storm.utils-test
   (:import [backtype.storm Config])
   (:import [backtype.storm.utils NimbusClient Utils])
-  (:import [com.netflix.curator.retry ExponentialBackoffRetry])
+  (:import [org.apache.curator.retry ExponentialBackoffRetry])
   (:import [org.apache.thrift.transport TTransportException])
   (:use [backtype.storm config util])
   (:use [clojure test])


Mime
View raw message