Repository: incubator-samoa Updated Branches: refs/heads/master 55b91dd5b -> fe61d1e74
SAMOA-27: Upgrade Storm version to 0.9 (giacbrd) Fix #25 Project: http://git-wip-us.apache.org/repos/asf/incubator-samoa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samoa/commit/fe61d1e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samoa/tree/fe61d1e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samoa/diff/fe61d1e7 Branch: refs/heads/master Commit: fe61d1e7404480c09d01410dbd42b68a06fc68e9 Parents: 55b91dd Author: Gianmarco De Francisci Morales <[email protected]> Authored: Fri May 15 10:26:27 2015 +0300 Committer: Gianmarco De Francisci Morales <[email protected]> Committed: Fri May 15 10:30:06 2015 +0300 ---------------------------------------------------------------------- bin/samoa | 3 +-- pom.xml | 6 +++--- samoa-storm/pom.xml | 4 ++-- .../yahoo/labs/samoa/topology/impl/StormTopologySubmitter.java | 4 +--- 4 files changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/fe61d1e7/bin/samoa ---------------------------------------------------------------------- diff --git a/bin/samoa b/bin/samoa index 3d6d340..b34f65b 100755 --- a/bin/samoa +++ b/bin/samoa @@ -201,8 +201,7 @@ elif [ $PLATFORM = 'STORM' ]; then if [ "$MODE_ARG" = "cluster" ]; then $STORM_EXEC jar $DEPLOYABLE com.yahoo.labs.samoa.topology.impl.StormDoTask $COMPLETE_ARG $NUM_WORKER $MODE_ARG elif [ "$MODE_ARG" = "local" ]; then - STORM_JAR=$(ls $STORM_HOME/storm-*.jar) - CLASSPATH="$CLASSPATH:$STORM_HOME/lib/*:$STORM_JAR:$DEPLOYABLE" + CLASSPATH="$CLASSPATH:$STORM_HOME/lib/*:$DEPLOYABLE" java -cp $CLASSPATH com.yahoo.labs.samoa.LocalStormDoTask $COMPLETE_ARG $NUM_WORKER fi http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/fe61d1e7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 57650c3..622d952 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ <jmockit.version>1.13</jmockit.version> <junit.version>4.10</junit.version> <kafka.version>0.8.1</kafka.version> - <kryo.version>2.17</kryo.version> + <kryo.version>2.21</kryo.version> <metrics-core.version>2.2.0</metrics-core.version> <miniball.version>1.0.3</miniball.version> <s4.version>0.6.0-incubating</s4.version> @@ -133,9 +133,9 @@ <slf4j-log4j12.version>1.7.2</slf4j-log4j12.version> <slf4j-simple.version>1.7.5</slf4j-simple.version> <maven-surefire-plugin.version>2.18</maven-surefire-plugin.version> - <storm.version>0.8.2</storm.version> + <storm.version>0.9.4</storm.version> <!-- storm 0.8.2 loads zookeeper classes with hardcoded names from 3.3 version--> - <zookeeper.storm.version>3.3.6</zookeeper.storm.version> + <zookeeper.storm.version>3.4.6</zookeeper.storm.version> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/fe61d1e7/samoa-storm/pom.xml ---------------------------------------------------------------------- diff --git a/samoa-storm/pom.xml b/samoa-storm/pom.xml index ce9aa89..abd351b 100644 --- a/samoa-storm/pom.xml +++ b/samoa-storm/pom.xml @@ -59,8 +59,8 @@ </dependency> <dependency> - <groupId>storm</groupId> - <artifactId>storm</artifactId> + <groupId>org.apache.storm</groupId> + <artifactId>storm-core</artifactId> <version>${storm.version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/fe61d1e7/samoa-storm/src/main/java/com/yahoo/labs/samoa/topology/impl/StormTopologySubmitter.java ---------------------------------------------------------------------- diff --git a/samoa-storm/src/main/java/com/yahoo/labs/samoa/topology/impl/StormTopologySubmitter.java b/samoa-storm/src/main/java/com/yahoo/labs/samoa/topology/impl/StormTopologySubmitter.java index bc703bc..bbac521 100644 --- a/samoa-storm/src/main/java/com/yahoo/labs/samoa/topology/impl/StormTopologySubmitter.java +++ b/samoa-storm/src/main/java/com/yahoo/labs/samoa/topology/impl/StormTopologySubmitter.java @@ -102,9 +102,7 @@ public class StormTopologySubmitter { Config config = new Config(); config.putAll(Utils.readStormConfig()); - String nimbusHost = (String) config.get(Config.NIMBUS_HOST); - - NimbusClient nc = new NimbusClient(nimbusHost); + NimbusClient nc = NimbusClient.getConfiguredClient(config); String topologyName = stormTopo.getTopologyName(); try { System.out.println("Submitting topology with name: "
