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/04/21 21:44:32 UTC
[33/50] [abbrv] git commit: align with 0.9.2-incubating dependencies.
align with 0.9.2-incubating dependencies.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/84f04c3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/84f04c3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/84f04c3f
Branch: refs/heads/master
Commit: 84f04c3fea11ccb6844bdef7baf8e6f654637981
Parents: e1b6fb4
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Mar 18 15:36:09 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Mar 18 15:36:09 2014 -0400
----------------------------------------------------------------------
pom.xml | 117 ++-------------------
src/jvm/storm/kafka/DynamicBrokersReader.java | 18 ++--
2 files changed, 17 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/84f04c3f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4626fbd..e6adc5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,26 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>net.wurstmeister.storm</groupId>
- <artifactId>storm-kafka-0.8-plus</artifactId>
+ <groupId>org.apache.storm</groupId>
+ <artifactId>storm-kafka</artifactId>
<packaging>jar</packaging>
- <version>0.5.0-SNAPSHOT</version>
- <name>storm-kafka-0.8-plus</name>
- <description>Storm module for kafka > 0.8</description>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
- <url>https://github.com/wurstmeister/storm-kafka-0.8-plus</url>
- <scm>
- <connection>scm:git:git://github.com/wurstmeister/storm-kafka-0.8-plus.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/wurstmeister/storm-kafka-0.8-plus.git</developerConnection>
- <url>https://github.com/wurstmeister/storm-kafka-0.8-plus</url>
- </scm>
+ <version>0.9.2-incubating-SNAPSHOT</version>
+ <name>storm-kafka</name>
+ <description>Storm Spouts for Apache Kafka</description>
<properties>
<scalaVersion>2.9.2</scalaVersion>
<kafkaArtifact>kafka_2.9.2</kafkaArtifact>
@@ -29,74 +15,11 @@
</properties>
<build>
<plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <classifier>${envClassifier}</classifier>
- </configuration>
- </plugin>
+
</plugins>
<sourceDirectory>src/jvm</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>dev-resources</directory>
- </testResource>
- <testResource>
- <directory>resources</directory>
- </testResource>
- </testResources>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
</build>
- <repositories>
- <repository>
- <id>central</id>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>clojars</id>
- <url>https://clojars.org/repo/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>scala-tools</id>
- <url>http://scala-tools.org/repo-releases</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>conjars</id>
- <url>http://conjars.org/repo/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
<dependencies>
<dependency>
<groupId>org.mockito</groupId>
@@ -118,7 +41,7 @@
<dependency>
<groupId>com.netflix.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>1.0.1</version>
+ <version>1.3.3</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -133,7 +56,7 @@
<dependency>
<groupId>com.netflix.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>1.0.1</version>
+ <version>1.3.3</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -145,7 +68,7 @@
<dependency>
<groupId>com.netflix.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>1.0.1</version>
+ <version>1.3.3</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -176,30 +99,10 @@
<dependency>
<groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId>
- <version>0.9.1-incubating</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>1.6.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojure</artifactId>
- <version>1.4.0</version>
+ <version>0.9.2-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>clojars</id>
- <name>Clojars repository</name>
- <url>https://clojars.org/repo</url>
- </repository>
- </distributionManagement>
-
<profiles>
<profile>
<id>Scala-2.10</id>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/84f04c3f/src/jvm/storm/kafka/DynamicBrokersReader.java
----------------------------------------------------------------------
diff --git a/src/jvm/storm/kafka/DynamicBrokersReader.java b/src/jvm/storm/kafka/DynamicBrokersReader.java
index 5b1d750..cd751fe 100644
--- a/src/jvm/storm/kafka/DynamicBrokersReader.java
+++ b/src/jvm/storm/kafka/DynamicBrokersReader.java
@@ -26,17 +26,13 @@ public class DynamicBrokersReader {
public DynamicBrokersReader(Map conf, String zkStr, String zkPath, String topic) {
_zkPath = zkPath;
_topic = topic;
- try {
- _curator = CuratorFrameworkFactory.newClient(
- zkStr,
- Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_SESSION_TIMEOUT)),
- 15000,
- new RetryNTimes(Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_RETRY_TIMES)),
- Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_RETRY_INTERVAL))));
- _curator.start();
- } catch (IOException ex) {
- LOG.error("can't connect to zookeeper");
- }
+ _curator = CuratorFrameworkFactory.newClient(
+ zkStr,
+ Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_SESSION_TIMEOUT)),
+ 15000,
+ new RetryNTimes(Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_RETRY_TIMES)),
+ Utils.getInt(conf.get(Config.STORM_ZOOKEEPER_RETRY_INTERVAL))));
+ _curator.start();
}
/**