storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptgo...@apache.org
Subject [30/50] [abbrv] git commit: align with version 0.9.0.1, clean up m2-pom.xml and align with project.clj, update README
Date Thu, 20 Mar 2014 21:22:53 GMT
align with version 0.9.0.1, clean up m2-pom.xml and align with project.clj, update README


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/8012cd7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/8012cd7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/8012cd7a

Branch: refs/heads/master
Commit: 8012cd7a4a8665469ccd4e89c4b7013f52007021
Parents: 8b40120
Author: P. Taylor Goetz <ptgoetz@gmail.com>
Authored: Sat Dec 7 00:24:28 2013 -0500
Committer: P. Taylor Goetz <ptgoetz@gmail.com>
Committed: Sat Dec 7 00:24:28 2013 -0500

----------------------------------------------------------------------
 README.markdown |  5 ++++-
 m2-pom.xml      | 49 ++++++++++++++++++++++---------------------------
 project.clj     |  2 +-
 3 files changed, 27 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8012cd7a/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 963e9c2..69941f2 100644
--- a/README.markdown
+++ b/README.markdown
@@ -88,8 +88,11 @@ the [Maven installation instructions](http://maven.apache.org/download.cgi).
 storm-starter contains [m2-pom.xml](m2-pom.xml) which can be used with Maven using the `-f`
option. For example, to
 compile and run `WordCountTopology` in local mode, use the command:
 
-    $ mvn -f m2-pom.xml compile exec:java -Dexec.classpathScope=compile -Dexec.mainClass=storm.starter.WordCountTopology
+    $ mvn -f m2-pom.xml compile exec:java -Dstorm.topology=storm.starter.WordCountTopology
 
+You can also run clojure topologies with Maven:
+
+    $ mvn -f m2-pom.xml compile exec:java -Dstorm.topology=storm.starter.clj.word_count
 
 ## Packaging storm-starter for use on a Storm cluster
 

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8012cd7a/m2-pom.xml
----------------------------------------------------------------------
diff --git a/m2-pom.xml b/m2-pom.xml
index 24293bc..8d04fc9 100644
--- a/m2-pom.xml
+++ b/m2-pom.xml
@@ -22,10 +22,6 @@
 			<id>clojars.org</id>
 			<url>http://clojars.org/repo</url>
 		</repository>
-		<repository>
-			<id>twitter4j</id>
-			<url>http://twitter4j.org/maven2</url>
-		</repository>
 	</repositories>
 
 	<dependencies>
@@ -38,7 +34,7 @@
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>
-			<version>6.8</version>
+			<version>6.8.5</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -62,31 +58,11 @@
 		<dependency>
 			<groupId>storm</groupId>
 			<artifactId>storm</artifactId>
-			<version>0.8.2</version>
+			<version>0.9.0.1</version>
 			<!-- keep storm out of the jar-with-dependencies -->
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.twitter4j</groupId>
-			<artifactId>twitter4j-core</artifactId>
-			<version>2.2.6-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.twitter4j</groupId>
-			<artifactId>twitter4j-stream</artifactId>
-			<version>2.2.6-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>com.googlecode.json-simple</groupId>
-			<artifactId>json-simple</artifactId>
-			<version>1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>13.0.1</version>
-		</dependency>
-		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
 			<version>3.2.1</version>
@@ -134,7 +110,7 @@
 			<plugin>
 				<groupId>com.theoryinpractise</groupId>
 				<artifactId>clojure-maven-plugin</artifactId>
-				<version>1.3.8</version>
+				<version>1.3.12</version>
 				<extensions>true</extensions>
 				<configuration>
 					<sourceDirectories>
@@ -159,6 +135,25 @@
 				</executions>
 
 			</plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>java</executable>
+                    <includeProjectDependencies>true</includeProjectDependencies>
+                    <includePluginDependencies>false</includePluginDependencies>
+                    <classpathScope>compile</classpathScope>
+                    <mainClass>${storm.topology}</mainClass>
+                </configuration>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8012cd7a/project.clj
----------------------------------------------------------------------
diff --git a/project.clj b/project.clj
index 8919275..ae6c377 100644
--- a/project.clj
+++ b/project.clj
@@ -15,7 +15,7 @@
                  ]
 
   :profiles {:dev
-              {:dependencies [[storm "0.8.2"]
+              {:dependencies [[storm "0.9.0.1"]
                               [org.clojure/clojure "1.4.0"]
                               [org.testng/testng "6.8.5"]
                               [org.easytesting/fest-assert-core "2.0M8"]


Mime
View raw message