upgrade storm version
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ddc3a47b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ddc3a47b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ddc3a47b Branch: refs/heads/master Commit: ddc3a47b2f4b5f7c8c7b35efc2c62e48f1fca939 Parents: 3fc7f30 Author: P. Taylor Goetz <ptgo...@gmail.com> Authored: Sun Mar 8 01:37:55 2015 -0500 Committer: P. Taylor Goetz <ptgo...@gmail.com> Committed: Sun Mar 8 01:37:55 2015 -0500 ---------------------------------------------------------------------- .gitignore | 1 + pom.xml | 2 +- .../storm/contrib/jms/trident/JmsState.java | 3 - storm-jms.iml | 85 -------------------- 4 files changed, 2 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ddc3a47b/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 7c73dad..faebb16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.ipr *.iws +*.iml target/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/storm/blob/ddc3a47b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 235fbdc..aa87b75 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ <properties> - <storm.version>0.9.2-incubating</storm.version> + <storm.version>0.9.3</storm.version> </properties> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/storm/blob/ddc3a47b/src/main/java/backtype/storm/contrib/jms/trident/JmsState.java ---------------------------------------------------------------------- diff --git a/src/main/java/backtype/storm/contrib/jms/trident/JmsState.java b/src/main/java/backtype/storm/contrib/jms/trident/JmsState.java index 6b7fdfb..2a285b4 100644 --- a/src/main/java/backtype/storm/contrib/jms/trident/JmsState.java +++ b/src/main/java/backtype/storm/contrib/jms/trident/JmsState.java @@ -18,10 +18,7 @@ package backtype.storm.contrib.jms.trident; import backtype.storm.contrib.jms.JmsProvider; -import backtype.storm.contrib.jms.trident.TridentJmsMessageProducer; import backtype.storm.topology.FailedException; -import backtype.storm.tuple.Values; -import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import storm.trident.operation.TridentCollector; http://git-wip-us.apache.org/repos/asf/storm/blob/ddc3a47b/storm-jms.iml ---------------------------------------------------------------------- diff --git a/storm-jms.iml b/storm-jms.iml deleted file mode 100644 index ac63ba4..0000000 --- a/storm-jms.iml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.storm:storm-core:0.9.2-incubating" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.clojure:clojure:1.5.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: clj-time:clj-time:0.4.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: joda-time:joda-time:2.0" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: compojure:compojure:1.1.3" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.clojure:core.incubator:0.1.0" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.clojure:tools.macro:0.1.0" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: clout:clout:1.0.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: ring:ring-core:1.1.5" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.6" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.4" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: hiccup:hiccup:0.3.6" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: ring:ring-devel:0.3.11" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: clj-stacktrace:clj-stacktrace:0.2.2" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: ring:ring-jetty-adapter:0.3.11" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: ring:ring-servlet:0.3.11" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.mortbay.jetty:jetty:6.1.26" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.mortbay.jetty:jetty-util:6.1.26" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.mortbay.jetty:servlet-api:2.5-20081211" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.clojure:tools.logging:0.2.3" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.clojure:math.numeric-tower:0.0.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.clojure:tools.cli:0.2.4" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-exec:1.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.5" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.curator:curator-framework:2.4.0" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.curator:curator-client:2.4.0" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.6.5" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.zookeeper:zookeeper:3.4.5" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: jline:jline:0.9.94" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.netty:netty:3.2.2.Final" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:13.0" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: com.twitter:carbonite:1.4.0" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: com.esotericsoftware.kryo:kryo:2.21" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: com.esotericsoftware.reflectasm:reflectasm:shaded:1.07" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:4.0" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: com.esotericsoftware.minlog:minlog:1.2" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.objenesis:objenesis:1.2" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: com.twitter:chill-java:0.3.5" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.11" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.3" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.disruptor:disruptor:2.10.1" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.jgrapht:jgrapht-core:0.9.0" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: ch.qos.logback:logback-classic:1.0.6" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: ch.qos.logback:logback-core:1.0.6" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:log4j-over-slf4j:1.6.6" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty:3.6.3.Final" level="project" /> - <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:activemq-core:5.5.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:activeio-core:3.1.2" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq:kahadb:5.5.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.apache.activemq.protobuf:activemq-protobuf:1.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.osgi:org.osgi.core:4.1.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: aopalliance:aopalliance:1.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: commons-net:commons-net:2.0" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: org.jasypt:jasypt:1.7" level="project" /> - </component> -</module> -
