Git Push Summary
Repository: storm Updated Tags: refs/tags/v0.11.0 [deleted] dc41a3969
storm git commit: [maven-release-plugin] prepare for next development iteration
Repository: storm Updated Branches: refs/heads/PR_736 5682c9602 -> 302399275 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/30239927 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/30239927 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/30239927 Branch: refs/heads/PR_736 Commit: 302399275f1f5721d33e7f06e91ddd144aa671dd Parents: 5682c96 Author: P. Taylor GoetzAuthored: Thu Sep 24 13:52:31 2015 -0400 Committer: P. Taylor Goetz Committed: Thu Sep 24 13:52:31 2015 -0400 -- pom.xml | 4 ++-- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 2 +- storm-core/pom.xml | 2 +- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml | 2 +- storm-multilang/ruby/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/30239927/pom.xml -- diff --git a/pom.xml b/pom.xml index d6018a8..08f830d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.storm storm -0.11.0 +0.11.1-SNAPSHOT pom Storm Distributed and fault-tolerant realtime computation @@ -157,7 +157,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/storm.git scm:git:https://git-wip-us.apache.org/repos/asf/storm.git -v0.11.0 +HEAD https://git-wip-us.apache.org/repos/asf/storm http://git-wip-us.apache.org/repos/asf/storm/blob/30239927/storm-buildtools/maven-shade-clojure-transformer/pom.xml -- diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml index 2f433b2..f1f1a8a 100644 --- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml +++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0 +0.11.1-SNAPSHOT ../../pom.xml http://git-wip-us.apache.org/repos/asf/storm/blob/30239927/storm-buildtools/storm-maven-plugins/pom.xml -- diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml index 28b4dd9..bd80742 100644 --- a/storm-buildtools/storm-maven-plugins/pom.xml +++ b/storm-buildtools/storm-maven-plugins/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0 +0.11.1-SNAPSHOT ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/30239927/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index d630908..0636a5c 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -20,7 +20,7 @@ storm org.apache.storm -0.11.0 +0.11.1-SNAPSHOT .. org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/30239927/storm-multilang/javascript/pom.xml -- diff --git a/storm-multilang/javascript/pom.xml b/storm-multilang/javascript/pom.xml index 6b47f58..06d8f11 100644 --- a/storm-multilang/javascript/pom.xml +++ b/storm-multilang/javascript/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0 +0.11.1-SNAPSHOT ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/30239927/storm-multilang/python/pom.xml -- diff --git a/storm-multilang/python/pom.xml b/storm-multilang/python/pom.xml index 6d3b8e1..673d362 100644 --- a/storm-multilang/python/pom.xml +++ b/storm-multilang/python/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0 +0.11.1-SNAPSHOT ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/30239927/storm-multilang/ruby/pom.xml -- diff --git a/storm-multilang/ruby/pom.xml b/storm-multilang/ruby/pom.xml index 54d7056..faef50a 100644 --- a/storm-multilang/ruby/pom.xml +++ b/storm-multilang/ruby/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -
Git Push Summary
Repository: storm Updated Tags: refs/tags/v0.11.0 [deleted] 91046e9e7
[1/3] storm git commit: Revert "[maven-release-plugin] prepare for next development iteration"
Repository: storm Updated Branches: refs/heads/PR_736 a26e63091 -> 40198d55f Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit a26e63091994597e6c4ca426aa14eec79db3f748. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c331b83e Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c331b83e Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c331b83e Branch: refs/heads/PR_736 Commit: c331b83e4d0cd5299befd1d47a4e62333e04 Parents: a26e630 Author: P. Taylor GoetzAuthored: Thu Sep 24 14:09:30 2015 -0400 Committer: P. Taylor Goetz Committed: Thu Sep 24 14:09:30 2015 -0400 -- pom.xml | 4 ++-- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 2 +- storm-core/pom.xml | 2 +- storm-dist/binary/pom.xml| 2 +- storm-dist/source/pom.xml| 2 +- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml | 2 +- storm-multilang/ruby/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/c331b83e/pom.xml -- diff --git a/pom.xml b/pom.xml index 08f830d..d6018a8 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.storm storm -0.11.1-SNAPSHOT +0.11.0 pom Storm Distributed and fault-tolerant realtime computation @@ -157,7 +157,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/storm.git scm:git:https://git-wip-us.apache.org/repos/asf/storm.git -HEAD +v0.11.0 https://git-wip-us.apache.org/repos/asf/storm http://git-wip-us.apache.org/repos/asf/storm/blob/c331b83e/storm-buildtools/maven-shade-clojure-transformer/pom.xml -- diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml index f1f1a8a..2f433b2 100644 --- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml +++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 ../../pom.xml http://git-wip-us.apache.org/repos/asf/storm/blob/c331b83e/storm-buildtools/storm-maven-plugins/pom.xml -- diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml index bd80742..28b4dd9 100644 --- a/storm-buildtools/storm-maven-plugins/pom.xml +++ b/storm-buildtools/storm-maven-plugins/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/c331b83e/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 0636a5c..d630908 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -20,7 +20,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 .. org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/c331b83e/storm-dist/binary/pom.xml -- diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml index 4378308..021f2f8 100644 --- a/storm-dist/binary/pom.xml +++ b/storm-dist/binary/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/c331b83e/storm-dist/source/pom.xml -- diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml index 2b7b203..9b1a056 100644 --- a/storm-dist/source/pom.xml +++ b/storm-dist/source/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/c331b83e/storm-multilang/javascript/pom.xml -- diff --git a/storm-multilang/javascript/pom.xml b/storm-multilang/javascript/pom.xml index
[2/3] storm git commit: Revert "[maven-release-plugin] prepare release v0.11.0"
Revert "[maven-release-plugin] prepare release v0.11.0" This reverts commit 900e85eca9f26081a34af0c9350a273a7737. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/edccd721 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/edccd721 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/edccd721 Branch: refs/heads/PR_736 Commit: edccd7216108717e7376deed91120477444dc436 Parents: c331b83 Author: P. Taylor GoetzAuthored: Thu Sep 24 14:09:33 2015 -0400 Committer: P. Taylor Goetz Committed: Thu Sep 24 14:09:33 2015 -0400 -- pom.xml | 4 ++-- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 5 +++-- storm-core/pom.xml | 6 +++--- storm-dist/binary/pom.xml| 2 +- storm-dist/source/pom.xml| 2 +- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml | 2 +- storm-multilang/ruby/pom.xml | 2 +- 9 files changed, 14 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/edccd721/pom.xml -- diff --git a/pom.xml b/pom.xml index d6018a8..c0ca37e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.storm storm -0.11.0 +0.11.0-SNAPSHOT pom Storm Distributed and fault-tolerant realtime computation @@ -157,7 +157,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/storm.git scm:git:https://git-wip-us.apache.org/repos/asf/storm.git -v0.11.0 +HEAD https://git-wip-us.apache.org/repos/asf/storm http://git-wip-us.apache.org/repos/asf/storm/blob/edccd721/storm-buildtools/maven-shade-clojure-transformer/pom.xml -- diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml index 2f433b2..6489027 100644 --- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml +++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0 +0.11.0-SNAPSHOT ../../pom.xml http://git-wip-us.apache.org/repos/asf/storm/blob/edccd721/storm-buildtools/storm-maven-plugins/pom.xml -- diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml index 28b4dd9..de2155a 100644 --- a/storm-buildtools/storm-maven-plugins/pom.xml +++ b/storm-buildtools/storm-maven-plugins/pom.xml @@ -15,13 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> -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;> +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;> 4.0.0 storm org.apache.storm -0.11.0 +0.11.0-SNAPSHOT ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/edccd721/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index d630908..7dc5c03 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -20,7 +20,7 @@ storm org.apache.storm -0.11.0 +0.11.0-SNAPSHOT .. org.apache.storm @@ -31,8 +31,8 @@ /etc/storm - - + + http://git-wip-us.apache.org/repos/asf/storm/blob/edccd721/storm-dist/binary/pom.xml -- diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml index 021f2f8..c2d709d 100644 --- a/storm-dist/binary/pom.xml +++ b/storm-dist/binary/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0 +0.11.0-SNAPSHOT ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/edccd721/storm-dist/source/pom.xml -- diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml
[5/6] storm git commit: Merge branch 'STORM-1042' of github.com:revans2/incubator-storm into PR_736
Merge branch 'STORM-1042' of github.com:revans2/incubator-storm into PR_736 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c139307e Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c139307e Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c139307e Branch: refs/heads/PR_736 Commit: c139307e29bb4ad1992847f05d6974be0ab0760d Parents: 99285bb 53c7d77 Author: P. Taylor GoetzAuthored: Thu Sep 24 13:32:14 2015 -0400 Committer: P. Taylor Goetz Committed: Thu Sep 24 13:32:14 2015 -0400 -- DEVELOPER.md | 44 ++-- dev-tools/travis/travis-install.sh | 13 +- dev-tools/travis/travis-script.sh | 2 +- external/storm-elasticsearch/pom.xml | 5 + external/storm-kafka/pom.xml | 5 + external/storm-solr/pom.xml| 4 +- pom.xml| 135 +++--- storm-core/pom.xml | 259 storm-core/src/clj/backtype/storm/log.clj | 2 +- storm-dist/binary/src/main/assembly/binary.xml | 32 --- 10 files changed, 298 insertions(+), 203 deletions(-) --
[3/6] storm git commit: Fixed some spelling issues
Fixed some spelling issues Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7db968d5 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7db968d5 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7db968d5 Branch: refs/heads/PR_736 Commit: 7db968d5932e32691099ce9a204f7de1ec9efc99 Parents: ffa73f8 Author: Robert (Bobby) EvansAuthored: Thu Sep 17 14:03:20 2015 -0500 Committer: Robert (Bobby) Evans Committed: Thu Sep 17 14:03:20 2015 -0500 -- storm-core/pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/7db968d5/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 8d0608e..7dc5c03 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -608,10 +608,10 @@ org.clojure:core.incubator**/*.clj cheshire:cheshire**/*.clj
[1/6] storm git commit: Shaded everything that was not already shaded, and cleaned up build so the dependency-reduced pom.xml is used correctly.
Repository: storm Updated Branches: refs/heads/PR_736 [created] 5682c9602 Shaded everything that was not already shaded, and cleaned up build so the dependency-reduced pom.xml is used correctly. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2e0597b1 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2e0597b1 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2e0597b1 Branch: refs/heads/PR_736 Commit: 2e0597b16cd431290fed065463997d8e5412bc84 Parents: 8eb4509 Author: Robert (Bobby) EvansAuthored: Fri Sep 11 11:56:34 2015 -0500 Committer: Robert (Bobby) Evans Committed: Tue Sep 15 14:28:31 2015 -0500 -- DEVELOPER.md | 42 ++-- dev-tools/travis/travis-install.sh | 15 +- dev-tools/travis/travis-script.sh | 2 +- external/storm-elasticsearch/pom.xml | 5 + external/storm-kafka/pom.xml | 5 + external/storm-solr/pom.xml| 4 +- pom.xml| 135 --- storm-core/pom.xml | 253 +++- storm-core/src/clj/backtype/storm/log.clj | 2 +- storm-dist/binary/src/main/assembly/binary.xml | 32 --- 10 files changed, 293 insertions(+), 202 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/DEVELOPER.md -- diff --git a/DEVELOPER.md b/DEVELOPER.md index 3634f11..571ec01 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -222,19 +222,21 @@ To pull in a merge request you should generally follow the command line instruct # Build the code and run the tests -The following commands must be run from the top-level directory. +Storm has some oddities with packaging and plugin dependencies. We build our own plugins and shade storm-core, +but have sub-modules that depend on storm-core. Because of this the build needs to be split into two parts. +You can still build in a single step, but the resulting packages may not be completely correct, or you might get +compilation or test errors with missing classes, etc. -# Build the code and run the tests (requires nodejs, python and ruby installed) -# `mvn clean package` will fail because storm-core requires storm-maven-plugin. -# This plugin should be installed before compiling storm-core. -$ mvn clean install +The first step is to build/install the plugins and storm-core -# Build the code and run the tests, with specifying default test timeout (in millisecond) -$ export STORM_TEST_TIMEOUT_MS=1 -$ mvn clean install +`mvn clean install -Pstorm-core` -# Build the code but skip the tests -$ mvn clean install -DskipTests=true +If you wish to skip the unit tests you can do this by adding `-DskipTests` to the command line. Once this +completes successfully you may run + +`mvn clean install -Pstorm-more` + +to build and test all of the external libraries and examples. Again if you want to include `-DskipTests` you can. In case you modified `storm.thrift`, you have to regenerate thrift code as java and python code before compiling whole project. @@ -243,23 +245,8 @@ cd storm-core/src sh genthrift.sh ``` -You can also run tests selectively via the Clojure REPL. The following example runs the tests in -[auth_test.clj](storm-core/test/clj/backtype/storm/security/auth/auth_test.clj), which has the namespace -`backtype.storm.security.auth.auth-test`. - -First, start the REPL from within the relevant sub-project (here: `storm-core`): +You can also run tests selectively with `-Dtest=`. This works for both clojure and junit tests. -$ cd storm-core/ -$ mvn clojure:repl - -Now we run the tests in `auth_test.clj` in the REPL: - -```clojure -;; You can use both absolute as well as relative paths to the .clj file. -(load-file "test/clj/backtype/storm/security/auth/auth_test.clj") -(ns backtype.storm.security.auth.auth-test) -(run-tests) -``` > Tip: IDEs such as IntelliJ IDEA support a built-in Clojure REPL, which you > can also use to run tests selectively. > Sometimes you may find that tests pass/fail depending on which REPL you use, > which -- although frustrating -- @@ -274,7 +261,8 @@ You can create a _distribution_ (like what you can download from Apache) as foll do not use the Maven release plugin because creating an official release is the task of our release manager. # First, build the code. -$ mvn clean install # you may skip tests with `-DskipTests=true` to save time +$ mvn clean install -Pstorm-core # you may skip tests with `-DskipTests=true` to save time +$ mvn clean install -Pstorm-more # you may skip tests with
Git Push Summary
Repository: storm Updated Tags: refs/tags/v0.11.0 [created] dc41a3969
[6/6] storm git commit: [maven-release-plugin] prepare release v0.11.0
[maven-release-plugin] prepare release v0.11.0 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5682c960 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5682c960 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5682c960 Branch: refs/heads/PR_736 Commit: 5682c960265c66d8f8c8d70757142e9d7beaf70e Parents: c139307 Author: P. Taylor GoetzAuthored: Thu Sep 24 13:52:04 2015 -0400 Committer: P. Taylor Goetz Committed: Thu Sep 24 13:52:04 2015 -0400 -- pom.xml | 4 ++-- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 5 ++--- storm-core/pom.xml | 6 +++--- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml | 2 +- storm-multilang/ruby/pom.xml | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/5682c960/pom.xml -- diff --git a/pom.xml b/pom.xml index c0ca37e..d6018a8 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.storm storm -0.11.0-SNAPSHOT +0.11.0 pom Storm Distributed and fault-tolerant realtime computation @@ -157,7 +157,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/storm.git scm:git:https://git-wip-us.apache.org/repos/asf/storm.git -HEAD +v0.11.0 https://git-wip-us.apache.org/repos/asf/storm http://git-wip-us.apache.org/repos/asf/storm/blob/5682c960/storm-buildtools/maven-shade-clojure-transformer/pom.xml -- diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml index 6489027..2f433b2 100644 --- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml +++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0-SNAPSHOT +0.11.0 ../../pom.xml http://git-wip-us.apache.org/repos/asf/storm/blob/5682c960/storm-buildtools/storm-maven-plugins/pom.xml -- diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml index de2155a..28b4dd9 100644 --- a/storm-buildtools/storm-maven-plugins/pom.xml +++ b/storm-buildtools/storm-maven-plugins/pom.xml @@ -15,14 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -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;> +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;> 4.0.0 storm org.apache.storm -0.11.0-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/5682c960/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 7dc5c03..d630908 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -20,7 +20,7 @@ storm org.apache.storm -0.11.0-SNAPSHOT +0.11.0 .. org.apache.storm @@ -31,8 +31,8 @@ /etc/storm - - + + http://git-wip-us.apache.org/repos/asf/storm/blob/5682c960/storm-multilang/javascript/pom.xml -- diff --git a/storm-multilang/javascript/pom.xml b/storm-multilang/javascript/pom.xml index e1cb993..6b47f58 100644 --- a/storm-multilang/javascript/pom.xml +++ b/storm-multilang/javascript/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/5682c960/storm-multilang/python/pom.xml -- diff --git a/storm-multilang/python/pom.xml b/storm-multilang/python/pom.xml index 379c0bc..6d3b8e1 100644 --- a/storm-multilang/python/pom.xml +++ b/storm-multilang/python/pom.xml @@ -21,7 +21,7 @@ storm
[2/6] storm git commit: Adressed review comments
Adressed review comments Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ffa73f87 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ffa73f87 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ffa73f87 Branch: refs/heads/PR_736 Commit: ffa73f87c04844219d3c172e23f830e066261017 Parents: 2e0597b Author: Robert (Bobby) EvansAuthored: Wed Sep 16 10:58:29 2015 -0500 Committer: Robert (Bobby) Evans Committed: Wed Sep 16 10:58:29 2015 -0500 -- dev-tools/travis/travis-install.sh | 2 -- dev-tools/travis/travis-script.sh | 2 +- storm-core/pom.xml | 8 +++- 3 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/ffa73f87/dev-tools/travis/travis-install.sh -- diff --git a/dev-tools/travis/travis-install.sh b/dev-tools/travis/travis-install.sh index 4988aba..d600bf8 100755 --- a/dev-tools/travis/travis-install.sh +++ b/dev-tools/travis/travis-install.sh @@ -35,8 +35,6 @@ then exit ${BUILD_RET_VAL} fi -exit ${BUILD_RET_VAL} - python ${TRAVIS_SCRIPT_DIR}/save-logs.py "install-storm-more.txt" mvn clean install -DskipTests -Pstorm-more BUILD_RET_VAL=$? http://git-wip-us.apache.org/repos/asf/storm/blob/ffa73f87/dev-tools/travis/travis-script.sh -- diff --git a/dev-tools/travis/travis-script.sh b/dev-tools/travis/travis-script.sh index be698bd..e349d6f 100755 --- a/dev-tools/travis/travis-script.sh +++ b/dev-tools/travis/travis-script.sh @@ -31,7 +31,7 @@ cd ${STORM_SRC_ROOT_DIR} export STORM_TEST_TIMEOUT_MS=10 # We now lean on Travis CI's implicit behavior, ```mvn clean install -DskipTests``` before running script -mvn test -fae -Pnative -Pstorm-core && mvn test -fae -Pnative -Pstorm-more +mvn test -fae -Pnative -Pstorm-core && mvn test -fae -Pstorm-more BUILD_RET_VAL=$? for dir in `find . -type d -and -wholename \*/target/\*-reports`; http://git-wip-us.apache.org/repos/asf/storm/blob/ffa73f87/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index ca40cb8..8d0608e 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -495,7 +495,7 @@ org.apache.thrift - + org.apache.thrift7 @@ -607,6 +607,12 @@ + org.clojure:core.incubator**/*.clj cheshire:cheshire**/*.clj org.clojure:tools.logging**/*.clj
[4/4] storm git commit: Added STORM-1017 to CHANGELOG.
Added STORM-1017 to CHANGELOG. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/99285bb7 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/99285bb7 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/99285bb7 Branch: refs/heads/master Commit: 99285bb719357760f572d6f4f0fb4cd02a8fd389 Parents: da12450 Author: Sriharsha ChintalapaniAuthored: Thu Sep 24 09:38:11 2015 -0700 Committer: Sriharsha Chintalapani Committed: Thu Sep 24 09:38:11 2015 -0700 -- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/99285bb7/CHANGELOG.md -- diff --git a/CHANGELOG.md b/CHANGELOG.md index 259cbc4..f5b1c1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## 0.11.0 + * STORM-1017: If ignoreZkOffsets set true,KafkaSpout will reset zk offset when recover from failure. * STORM-1054: Excessive logging ShellBasedGroupsMapping if the user doesn't have any groups. * STORM-954: Toplogy Event Inspector * STORM-862: Pluggable System Metrics
[2/4] storm git commit: STORM-1017: Ignore ignoreZkOffsets for trident.
STORM-1017: Ignore ignoreZkOffsets for trident. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/56cfdbf8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/56cfdbf8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/56cfdbf8 Branch: refs/heads/master Commit: 56cfdbf8d9b3b6044d7aa05dfb6b501c24b2f277 Parents: a89b7ff Author: PriyankAuthored: Tue Sep 22 09:14:26 2015 -0700 Committer: Priyank Committed: Tue Sep 22 09:14:26 2015 -0700 -- .../src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java | 4 ++-- .../jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/56cfdbf8/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java -- diff --git a/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java b/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java index 136e7d2..7e7e4d8 100644 --- a/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java +++ b/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java @@ -30,7 +30,6 @@ public class OpaqueTridentKafkaSpout implements IOpaquePartitionedTridentSpout getEmitter(Map conf, TopologyContext context) { -return new TridentKafkaEmitter(conf, context, _config, _topologyInstanceId).asOpaqueEmitter(); +return new TridentKafkaEmitter(conf, context, _config, context +.getStormId()).asOpaqueEmitter(); } @Override http://git-wip-us.apache.org/repos/asf/storm/blob/56cfdbf8/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java -- diff --git a/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java b/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java index 8c10bed..9feffc8 100644 --- a/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java +++ b/external/storm-kafka/src/jvm/storm/kafka/trident/TransactionalTridentKafkaSpout.java @@ -29,7 +29,6 @@ import java.util.UUID; public class TransactionalTridentKafkaSpout implements IPartitionedTridentSpout { TridentKafkaConfig _config; -String _topologyInstanceId = UUID.randomUUID().toString(); public TransactionalTridentKafkaSpout(TridentKafkaConfig config) { _config = config; @@ -43,7 +42,8 @@ public class TransactionalTridentKafkaSpout implements IPartitionedTridentSpout< @Override public IPartitionedTridentSpout.Emitter getEmitter(Map conf, TopologyContext context) { -return new TridentKafkaEmitter(conf, context, _config, _topologyInstanceId).asTransactionalEmitter(); +return new TridentKafkaEmitter(conf, context, _config, context +.getStormId()).asTransactionalEmitter(); } @Override
Git Push Summary
Repository: storm Updated Tags: refs/tags/v0.10.0 [deleted] 64f9778fe
[1/3] storm git commit: Revert "[maven-release-plugin] prepare for next development iteration"
Repository: storm Updated Branches: refs/heads/PR_736 302399275 -> 900e85eca Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 302399275f1f5721d33e7f06e91ddd144aa671dd. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1853b0a8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1853b0a8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1853b0a8 Branch: refs/heads/PR_736 Commit: 1853b0a842ad8245d08d7d9909dd7ef9da9afc67 Parents: 3023992 Author: P. Taylor GoetzAuthored: Thu Sep 24 13:56:58 2015 -0400 Committer: P. Taylor Goetz Committed: Thu Sep 24 13:56:58 2015 -0400 -- pom.xml | 4 ++-- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 2 +- storm-core/pom.xml | 2 +- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml | 2 +- storm-multilang/ruby/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/1853b0a8/pom.xml -- diff --git a/pom.xml b/pom.xml index 08f830d..d6018a8 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.storm storm -0.11.1-SNAPSHOT +0.11.0 pom Storm Distributed and fault-tolerant realtime computation @@ -157,7 +157,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/storm.git scm:git:https://git-wip-us.apache.org/repos/asf/storm.git -HEAD +v0.11.0 https://git-wip-us.apache.org/repos/asf/storm http://git-wip-us.apache.org/repos/asf/storm/blob/1853b0a8/storm-buildtools/maven-shade-clojure-transformer/pom.xml -- diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml index f1f1a8a..2f433b2 100644 --- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml +++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 ../../pom.xml http://git-wip-us.apache.org/repos/asf/storm/blob/1853b0a8/storm-buildtools/storm-maven-plugins/pom.xml -- diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml index bd80742..28b4dd9 100644 --- a/storm-buildtools/storm-maven-plugins/pom.xml +++ b/storm-buildtools/storm-maven-plugins/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/1853b0a8/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 0636a5c..d630908 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -20,7 +20,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 .. org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/1853b0a8/storm-multilang/javascript/pom.xml -- diff --git a/storm-multilang/javascript/pom.xml b/storm-multilang/javascript/pom.xml index 06d8f11..6b47f58 100644 --- a/storm-multilang/javascript/pom.xml +++ b/storm-multilang/javascript/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/1853b0a8/storm-multilang/python/pom.xml -- diff --git a/storm-multilang/python/pom.xml b/storm-multilang/python/pom.xml index 673d362..6d3b8e1 100644 --- a/storm-multilang/python/pom.xml +++ b/storm-multilang/python/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.1-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/1853b0a8/storm-multilang/ruby/pom.xml -- diff --git a/storm-multilang/ruby/pom.xml b/storm-multilang/ruby/pom.xml index faef50a..54d7056 100644 --- a/storm-multilang/ruby/pom.xml +++
Git Push Summary
Repository: storm Updated Tags: refs/tags/v0.11.0 [deleted] 77c79298b
[3/3] storm git commit: [maven-release-plugin] prepare release v0.11.0
[maven-release-plugin] prepare release v0.11.0 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/40198d55 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/40198d55 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/40198d55 Branch: refs/heads/PR_736 Commit: 40198d55f7c5b601d948dd28c115bd6e134bcdb6 Parents: edccd72 Author: P. Taylor GoetzAuthored: Thu Sep 24 14:17:22 2015 -0400 Committer: P. Taylor Goetz Committed: Thu Sep 24 14:17:22 2015 -0400 -- pom.xml | 4 ++-- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 5 ++--- storm-core/pom.xml | 6 +++--- storm-dist/binary/pom.xml| 2 +- storm-dist/source/pom.xml| 2 +- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml | 2 +- storm-multilang/ruby/pom.xml | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/40198d55/pom.xml -- diff --git a/pom.xml b/pom.xml index c0ca37e..d6018a8 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.storm storm -0.11.0-SNAPSHOT +0.11.0 pom Storm Distributed and fault-tolerant realtime computation @@ -157,7 +157,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/storm.git scm:git:https://git-wip-us.apache.org/repos/asf/storm.git -HEAD +v0.11.0 https://git-wip-us.apache.org/repos/asf/storm http://git-wip-us.apache.org/repos/asf/storm/blob/40198d55/storm-buildtools/maven-shade-clojure-transformer/pom.xml -- diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml index 6489027..2f433b2 100644 --- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml +++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0-SNAPSHOT +0.11.0 ../../pom.xml http://git-wip-us.apache.org/repos/asf/storm/blob/40198d55/storm-buildtools/storm-maven-plugins/pom.xml -- diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml index de2155a..28b4dd9 100644 --- a/storm-buildtools/storm-maven-plugins/pom.xml +++ b/storm-buildtools/storm-maven-plugins/pom.xml @@ -15,14 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -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;> +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;> 4.0.0 storm org.apache.storm -0.11.0-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/40198d55/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 7dc5c03..d630908 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -20,7 +20,7 @@ storm org.apache.storm -0.11.0-SNAPSHOT +0.11.0 .. org.apache.storm @@ -31,8 +31,8 @@ /etc/storm - - + + http://git-wip-us.apache.org/repos/asf/storm/blob/40198d55/storm-dist/binary/pom.xml -- diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml index c2d709d..021f2f8 100644 --- a/storm-dist/binary/pom.xml +++ b/storm-dist/binary/pom.xml @@ -21,7 +21,7 @@ storm org.apache.storm -0.11.0-SNAPSHOT +0.11.0 ../../pom.xml org.apache.storm http://git-wip-us.apache.org/repos/asf/storm/blob/40198d55/storm-dist/source/pom.xml -- diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml index 5b83c07..9b1a056 100644 --- a/storm-dist/source/pom.xml +++