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 2018/09/21 16:30:40 UTC

[1/8] storm git commit: Merge branch 'STORM-2912' of github.com:HeartSaVioR/storm

Repository: storm
Updated Branches:
  refs/heads/master b2a1a5872 -> 94c6a644a


Merge branch 'STORM-2912' of github.com:HeartSaVioR/storm


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

Branch: refs/heads/master
Commit: 278f01bf09ee6d0bbe71315a69118961405b19fe
Parents: fc4ac8e 1b918e5
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Jan 26 13:24:27 2018 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Jan 26 13:24:27 2018 -0500

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/executor/Executor.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[8/8] storm git commit: [maven-release-plugin] prepare for next development iteration

Posted by pt...@apache.org.
[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/94c6a644
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/94c6a644
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/94c6a644

Branch: refs/heads/master
Commit: 94c6a644aeb27b6c689d7b9f68bd2e7adb5c8734
Parents: 062bb2f
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Sep 21 12:30:34 2018 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Sep 21 12:30:34 2018 -0400

----------------------------------------------------------------------
 examples/storm-elasticsearch-examples/pom.xml            | 2 +-
 examples/storm-hbase-examples/pom.xml                    | 2 +-
 examples/storm-hdfs-examples/pom.xml                     | 2 +-
 examples/storm-hive-examples/pom.xml                     | 2 +-
 examples/storm-jdbc-examples/pom.xml                     | 2 +-
 examples/storm-jms-examples/pom.xml                      | 2 +-
 examples/storm-kafka-client-examples/pom.xml             | 2 +-
 examples/storm-loadgen/pom.xml                           | 2 +-
 examples/storm-mongodb-examples/pom.xml                  | 2 +-
 examples/storm-mqtt-examples/pom.xml                     | 2 +-
 examples/storm-opentsdb-examples/pom.xml                 | 2 +-
 examples/storm-perf/pom.xml                              | 2 +-
 examples/storm-pmml-examples/pom.xml                     | 2 +-
 examples/storm-redis-examples/pom.xml                    | 2 +-
 examples/storm-rocketmq-examples/pom.xml                 | 2 +-
 examples/storm-solr-examples/pom.xml                     | 2 +-
 examples/storm-starter/pom.xml                           | 2 +-
 external/storm-autocreds/pom.xml                         | 2 +-
 external/storm-blobstore-migration/pom.xml               | 2 +-
 external/storm-cassandra/pom.xml                         | 2 +-
 external/storm-elasticsearch/pom.xml                     | 2 +-
 external/storm-eventhubs/pom.xml                         | 2 +-
 external/storm-hbase/pom.xml                             | 2 +-
 external/storm-hdfs-blobstore/pom.xml                    | 2 +-
 external/storm-hdfs/pom.xml                              | 2 +-
 external/storm-hive/pom.xml                              | 2 +-
 external/storm-jdbc/pom.xml                              | 2 +-
 external/storm-jms/pom.xml                               | 2 +-
 external/storm-kafka-client/pom.xml                      | 2 +-
 external/storm-kafka-migration/pom.xml                   | 2 +-
 external/storm-kafka-monitor/pom.xml                     | 2 +-
 external/storm-kinesis/pom.xml                           | 2 +-
 external/storm-metrics/pom.xml                           | 2 +-
 external/storm-mongodb/pom.xml                           | 2 +-
 external/storm-mqtt/pom.xml                              | 2 +-
 external/storm-opentsdb/pom.xml                          | 2 +-
 external/storm-pmml/pom.xml                              | 2 +-
 external/storm-redis/pom.xml                             | 2 +-
 external/storm-rocketmq/pom.xml                          | 2 +-
 external/storm-solr/pom.xml                              | 2 +-
 flux/flux-core/pom.xml                                   | 2 +-
 flux/flux-examples/pom.xml                               | 2 +-
 flux/flux-wrappers/pom.xml                               | 2 +-
 flux/pom.xml                                             | 2 +-
 integration-test/pom.xml                                 | 2 +-
 pom.xml                                                  | 4 ++--
 shaded-deps/pom.xml                                      | 2 +-
 sql/pom.xml                                              | 2 +-
 sql/storm-sql-core/pom.xml                               | 2 +-
 sql/storm-sql-external/storm-sql-hdfs/pom.xml            | 2 +-
 sql/storm-sql-external/storm-sql-kafka/pom.xml           | 2 +-
 sql/storm-sql-external/storm-sql-mongodb/pom.xml         | 2 +-
 sql/storm-sql-external/storm-sql-redis/pom.xml           | 2 +-
 sql/storm-sql-runtime/pom.xml                            | 2 +-
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml             | 2 +-
 storm-checkstyle/pom.xml                                 | 2 +-
 storm-client/pom.xml                                     | 2 +-
 storm-clojure-test/pom.xml                               | 2 +-
 storm-clojure/pom.xml                                    | 2 +-
 storm-core/pom.xml                                       | 2 +-
 storm-dist/binary/final-package/pom.xml                  | 2 +-
 storm-dist/binary/pom.xml                                | 2 +-
 storm-dist/binary/storm-client-bin/pom.xml               | 2 +-
 storm-dist/binary/storm-webapp-bin/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 +-
 storm-server/pom.xml                                     | 2 +-
 storm-submit-tools/pom.xml                               | 2 +-
 storm-webapp/pom.xml                                     | 4 ++--
 72 files changed, 74 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-elasticsearch-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-elasticsearch-examples/pom.xml b/examples/storm-elasticsearch-examples/pom.xml
index ccff964..001c16a 100644
--- a/examples/storm-elasticsearch-examples/pom.xml
+++ b/examples/storm-elasticsearch-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-hbase-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-hbase-examples/pom.xml b/examples/storm-hbase-examples/pom.xml
index 10e40c5..be870e0 100644
--- a/examples/storm-hbase-examples/pom.xml
+++ b/examples/storm-hbase-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-hdfs-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-hdfs-examples/pom.xml b/examples/storm-hdfs-examples/pom.xml
index 3b7e974..b116a3f 100644
--- a/examples/storm-hdfs-examples/pom.xml
+++ b/examples/storm-hdfs-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-hive-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-hive-examples/pom.xml b/examples/storm-hive-examples/pom.xml
index b83a27e..696b56c 100644
--- a/examples/storm-hive-examples/pom.xml
+++ b/examples/storm-hive-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-jdbc-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-jdbc-examples/pom.xml b/examples/storm-jdbc-examples/pom.xml
index cbb4e3a..6bc8bba 100644
--- a/examples/storm-jdbc-examples/pom.xml
+++ b/examples/storm-jdbc-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-jms-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-jms-examples/pom.xml b/examples/storm-jms-examples/pom.xml
index 2b5df240..10266c1 100644
--- a/examples/storm-jms-examples/pom.xml
+++ b/examples/storm-jms-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-kafka-client-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-kafka-client-examples/pom.xml b/examples/storm-kafka-client-examples/pom.xml
index 71eb2ef..4e70c63 100644
--- a/examples/storm-kafka-client-examples/pom.xml
+++ b/examples/storm-kafka-client-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-loadgen/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-loadgen/pom.xml b/examples/storm-loadgen/pom.xml
index efe690a..b3ba537 100644
--- a/examples/storm-loadgen/pom.xml
+++ b/examples/storm-loadgen/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>storm</artifactId>
     <groupId>org.apache.storm</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>storm-loadgen</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-mongodb-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-mongodb-examples/pom.xml b/examples/storm-mongodb-examples/pom.xml
index 09893b8..0b9081c 100644
--- a/examples/storm-mongodb-examples/pom.xml
+++ b/examples/storm-mongodb-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-mqtt-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-mqtt-examples/pom.xml b/examples/storm-mqtt-examples/pom.xml
index 7e7ce29..5f79cea 100644
--- a/examples/storm-mqtt-examples/pom.xml
+++ b/examples/storm-mqtt-examples/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>storm</artifactId>
     <groupId>org.apache.storm</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-opentsdb-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-opentsdb-examples/pom.xml b/examples/storm-opentsdb-examples/pom.xml
index 1fa6b65..9a882f0 100644
--- a/examples/storm-opentsdb-examples/pom.xml
+++ b/examples/storm-opentsdb-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-perf/pom.xml b/examples/storm-perf/pom.xml
index 868286b..444a9b8 100644
--- a/examples/storm-perf/pom.xml
+++ b/examples/storm-perf/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-pmml-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-pmml-examples/pom.xml b/examples/storm-pmml-examples/pom.xml
index cb7499a..e46514c 100644
--- a/examples/storm-pmml-examples/pom.xml
+++ b/examples/storm-pmml-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-redis-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-redis-examples/pom.xml b/examples/storm-redis-examples/pom.xml
index 5cbfffd..824609e 100644
--- a/examples/storm-redis-examples/pom.xml
+++ b/examples/storm-redis-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-rocketmq-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-rocketmq-examples/pom.xml b/examples/storm-rocketmq-examples/pom.xml
index 59d57bd..d3f389d 100644
--- a/examples/storm-rocketmq-examples/pom.xml
+++ b/examples/storm-rocketmq-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-solr-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-solr-examples/pom.xml b/examples/storm-solr-examples/pom.xml
index 9cfcb3d..cbb40c6 100644
--- a/examples/storm-solr-examples/pom.xml
+++ b/examples/storm-solr-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/examples/storm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index c395179..fa14a88 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   <parent>
       <artifactId>storm</artifactId>
       <groupId>org.apache.storm</groupId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-autocreds/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml
index d5a3eff..6c69740 100644
--- a/external/storm-autocreds/pom.xml
+++ b/external/storm-autocreds/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-blobstore-migration/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/pom.xml b/external/storm-blobstore-migration/pom.xml
index 3b521e6..f369196 100644
--- a/external/storm-blobstore-migration/pom.xml
+++ b/external/storm-blobstore-migration/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/pom.xml b/external/storm-cassandra/pom.xml
index 115b1db..1588404 100644
--- a/external/storm-cassandra/pom.xml
+++ b/external/storm-cassandra/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/pom.xml b/external/storm-elasticsearch/pom.xml
index 866a50e..3df78cc 100644
--- a/external/storm-elasticsearch/pom.xml
+++ b/external/storm-elasticsearch/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-eventhubs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml
index 861ca6d..eaaa36e 100755
--- a/external/storm-eventhubs/pom.xml
+++ b/external/storm-eventhubs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 5dd876d..b721791 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-hdfs-blobstore/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs-blobstore/pom.xml b/external/storm-hdfs-blobstore/pom.xml
index 8b7a169..3956c14 100644
--- a/external/storm-hdfs-blobstore/pom.xml
+++ b/external/storm-hdfs-blobstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 3c6a223..a835637 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-hive/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hive/pom.xml b/external/storm-hive/pom.xml
index 2d30c59..a337bcd 100644
--- a/external/storm-hive/pom.xml
+++ b/external/storm-hive/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>storm</artifactId>
     <groupId>org.apache.storm</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml
index c26da3d..c9be370 100644
--- a/external/storm-jdbc/pom.xml
+++ b/external/storm-jdbc/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-jms/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml
index 9075e3a..5977bf8 100644
--- a/external/storm-jms/pom.xml
+++ b/external/storm-jms/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index 4a10e76..aa72396 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-kafka-migration/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-migration/pom.xml b/external/storm-kafka-migration/pom.xml
index 577ebf9..3463708 100644
--- a/external/storm-kafka-migration/pom.xml
+++ b/external/storm-kafka-migration/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-kafka-monitor/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-monitor/pom.xml b/external/storm-kafka-monitor/pom.xml
index 6c61854..8f62afb 100644
--- a/external/storm-kafka-monitor/pom.xml
+++ b/external/storm-kafka-monitor/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-kinesis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kinesis/pom.xml b/external/storm-kinesis/pom.xml
index 8c9e02d..b513090 100644
--- a/external/storm-kinesis/pom.xml
+++ b/external/storm-kinesis/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-metrics/pom.xml b/external/storm-metrics/pom.xml
index 138e207..b105674 100644
--- a/external/storm-metrics/pom.xml
+++ b/external/storm-metrics/pom.xml
@@ -20,7 +20,7 @@
   <parent>
       <artifactId>storm</artifactId>
       <groupId>org.apache.storm</groupId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-mongodb/pom.xml b/external/storm-mongodb/pom.xml
index 2d7f4e7..a4e5ecc 100644
--- a/external/storm-mongodb/pom.xml
+++ b/external/storm-mongodb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-mqtt/pom.xml b/external/storm-mqtt/pom.xml
index a3057b6..282a07c 100644
--- a/external/storm-mqtt/pom.xml
+++ b/external/storm-mqtt/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.storm</groupId>
         <artifactId>storm</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-opentsdb/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-opentsdb/pom.xml b/external/storm-opentsdb/pom.xml
index 1c7cb9e..cbf4708 100644
--- a/external/storm-opentsdb/pom.xml
+++ b/external/storm-opentsdb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-pmml/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-pmml/pom.xml b/external/storm-pmml/pom.xml
index def8366..dd57158 100644
--- a/external/storm-pmml/pom.xml
+++ b/external/storm-pmml/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-redis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml
index e23f313..5617237 100644
--- a/external/storm-redis/pom.xml
+++ b/external/storm-redis/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-rocketmq/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-rocketmq/pom.xml b/external/storm-rocketmq/pom.xml
index 57ec38d..7507827 100644
--- a/external/storm-rocketmq/pom.xml
+++ b/external/storm-rocketmq/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/external/storm-solr/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-solr/pom.xml b/external/storm-solr/pom.xml
index 3e344a2..7751fff 100644
--- a/external/storm-solr/pom.xml
+++ b/external/storm-solr/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/flux/flux-core/pom.xml
----------------------------------------------------------------------
diff --git a/flux/flux-core/pom.xml b/flux/flux-core/pom.xml
index c46fa90..43ad9ec 100644
--- a/flux/flux-core/pom.xml
+++ b/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.storm</groupId>
         <artifactId>flux</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/flux/flux-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flux/flux-examples/pom.xml b/flux/flux-examples/pom.xml
index 1941f23..217bef5 100644
--- a/flux/flux-examples/pom.xml
+++ b/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.storm</groupId>
         <artifactId>flux</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/flux/flux-wrappers/pom.xml
----------------------------------------------------------------------
diff --git a/flux/flux-wrappers/pom.xml b/flux/flux-wrappers/pom.xml
index 661d82b..3978a8e 100644
--- a/flux/flux-wrappers/pom.xml
+++ b/flux/flux-wrappers/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.storm</groupId>
         <artifactId>flux</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/flux/pom.xml
----------------------------------------------------------------------
diff --git a/flux/pom.xml b/flux/pom.xml
index fad2ac3..3124e2a 100644
--- a/flux/pom.xml
+++ b/flux/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index bb9c295..6a56e39 100755
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 349d666..07d57b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
     <groupId>org.apache.storm</groupId>
     <artifactId>storm</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Storm</name>
     <description>Distributed and fault-tolerant realtime computation</description>
@@ -233,7 +233,7 @@
     <scm>
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</developerConnection>
-        <tag>v2.0.0</tag>
+        <tag>HEAD</tag>
         <url>https://git-wip-us.apache.org/repos/asf/storm</url>
     </scm>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 9b1a1c8..6208c33 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/sql/pom.xml
----------------------------------------------------------------------
diff --git a/sql/pom.xml b/sql/pom.xml
index f98d29a..8a2aaa2 100644
--- a/sql/pom.xml
+++ b/sql/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/sql/storm-sql-core/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/pom.xml b/sql/storm-sql-core/pom.xml
index 5c3771c..006fc45 100644
--- a/sql/storm-sql-core/pom.xml
+++ b/sql/storm-sql-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/sql/storm-sql-external/storm-sql-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-hdfs/pom.xml b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
index d65cc4a..1c20d4c 100644
--- a/sql/storm-sql-external/storm-sql-hdfs/pom.xml
+++ b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/sql/storm-sql-external/storm-sql-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-kafka/pom.xml b/sql/storm-sql-external/storm-sql-kafka/pom.xml
index dcdd7be..6c47bae 100644
--- a/sql/storm-sql-external/storm-sql-kafka/pom.xml
+++ b/sql/storm-sql-external/storm-sql-kafka/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/sql/storm-sql-external/storm-sql-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-mongodb/pom.xml b/sql/storm-sql-external/storm-sql-mongodb/pom.xml
index 7e70588..b0c1df5 100644
--- a/sql/storm-sql-external/storm-sql-mongodb/pom.xml
+++ b/sql/storm-sql-external/storm-sql-mongodb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/sql/storm-sql-external/storm-sql-redis/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-redis/pom.xml b/sql/storm-sql-external/storm-sql-redis/pom.xml
index 73fa951..9335cf4 100644
--- a/sql/storm-sql-external/storm-sql-redis/pom.xml
+++ b/sql/storm-sql-external/storm-sql-redis/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/sql/storm-sql-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/pom.xml b/sql/storm-sql-runtime/pom.xml
index 260f23a..b579fec 100644
--- a/sql/storm-sql-runtime/pom.xml
+++ b/sql/storm-sql-runtime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/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 cf4e423..e9cdd7c 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/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 3f97e20..d29866b 100644
--- a/storm-buildtools/storm-maven-plugins/pom.xml
+++ b/storm-buildtools/storm-maven-plugins/pom.xml
@@ -21,7 +21,7 @@
   <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/storm-checkstyle/pom.xml b/storm-checkstyle/pom.xml
index 2ee33be..a7d406b 100644
--- a/storm-checkstyle/pom.xml
+++ b/storm-checkstyle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index cefbb84..cb08911 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-clojure-test/pom.xml
----------------------------------------------------------------------
diff --git a/storm-clojure-test/pom.xml b/storm-clojure-test/pom.xml
index e9957a4..b0fddd6 100644
--- a/storm-clojure-test/pom.xml
+++ b/storm-clojure-test/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>storm-clojure-test</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-clojure/pom.xml
----------------------------------------------------------------------
diff --git a/storm-clojure/pom.xml b/storm-clojure/pom.xml
index af01d99..85e5aba 100644
--- a/storm-clojure/pom.xml
+++ b/storm-clojure/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>storm-clojure</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index aee79c0..fb91fd3 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-dist/binary/final-package/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/final-package/pom.xml b/storm-dist/binary/final-package/pom.xml
index 874c83a..f006202 100644
--- a/storm-dist/binary/final-package/pom.xml
+++ b/storm-dist/binary/final-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apache-storm-bin</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml
index 8029f06..44c4964 100644
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-dist/binary/storm-client-bin/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/storm-client-bin/pom.xml b/storm-dist/binary/storm-client-bin/pom.xml
index ea88694..1eb118e 100644
--- a/storm-dist/binary/storm-client-bin/pom.xml
+++ b/storm-dist/binary/storm-client-bin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apache-storm-bin</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-dist/binary/storm-webapp-bin/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/storm-webapp-bin/pom.xml b/storm-dist/binary/storm-webapp-bin/pom.xml
index 6de25fe..6918ca6 100644
--- a/storm-dist/binary/storm-webapp-bin/pom.xml
+++ b/storm-dist/binary/storm-webapp-bin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apache-storm-bin</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-dist/source/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml
index 56043b5..ce6c494 100644
--- a/storm-dist/source/pom.xml
+++ b/storm-dist/source/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-multilang/javascript/pom.xml
----------------------------------------------------------------------
diff --git a/storm-multilang/javascript/pom.xml b/storm-multilang/javascript/pom.xml
index 42e19b6..196ba01 100644
--- a/storm-multilang/javascript/pom.xml
+++ b/storm-multilang/javascript/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-multilang/python/pom.xml
----------------------------------------------------------------------
diff --git a/storm-multilang/python/pom.xml b/storm-multilang/python/pom.xml
index ce83131..56173f8 100644
--- a/storm-multilang/python/pom.xml
+++ b/storm-multilang/python/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-multilang/ruby/pom.xml
----------------------------------------------------------------------
diff --git a/storm-multilang/ruby/pom.xml b/storm-multilang/ruby/pom.xml
index 7933e57..325999b 100644
--- a/storm-multilang/ruby/pom.xml
+++ b/storm-multilang/ruby/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-server/pom.xml
----------------------------------------------------------------------
diff --git a/storm-server/pom.xml b/storm-server/pom.xml
index 3bc389e..cd145be 100644
--- a/storm-server/pom.xml
+++ b/storm-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-submit-tools/pom.xml
----------------------------------------------------------------------
diff --git a/storm-submit-tools/pom.xml b/storm-submit-tools/pom.xml
index 55f584d..dd944a4 100644
--- a/storm-submit-tools/pom.xml
+++ b/storm-submit-tools/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/94c6a644/storm-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/storm-webapp/pom.xml b/storm-webapp/pom.xml
index 82d0bcb..7bc3b7b 100644
--- a/storm-webapp/pom.xml
+++ b/storm-webapp/pom.xml
@@ -21,7 +21,7 @@
 
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0</version>
+        <version>2.0.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.storm</groupId>
             <artifactId>storm-core</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.1-SNAPSHOT</version>
             <scope>${provided.scope}</scope>
         </dependency>
         <dependency>


[2/8] storm git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm

Posted by pt...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm


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

Branch: refs/heads/master
Commit: f991dae41641eeb9101ec832dd2fd29b5ed3e059
Parents: 278f01b 12cc49f
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Feb 7 14:02:54 2018 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Feb 7 14:02:54 2018 -0500

----------------------------------------------------------------------
 docs/storm-kafka-client.md                      |  47 +-
 examples/storm-perf/README.markdown             |  15 +-
 examples/storm-perf/pom.xml                     |  10 +
 .../main/conf/KafkaClientSpoutNullBoltTopo.yml  |  20 +
 .../perf/KafkaClientSpoutNullBoltTopo.java      | 113 ++++
 .../apache/storm/perf/utils/MetricsSample.java  |  18 +-
 .../storm/common/AbstractHadoopAutoCreds.java   |   6 +
 external/storm-blobstore-migration/pom.xml      |   2 +-
 .../org/apache/storm/hbase/common/Utils.java    |  26 +-
 external/storm-hdfs-blobstore/pom.xml           | 251 +++++++++
 .../storm/hdfs/blobstore/HdfsBlobStore.java     | 394 ++++++++++++++
 .../storm/hdfs/blobstore/HdfsBlobStoreFile.java | 196 +++++++
 .../storm/hdfs/blobstore/HdfsBlobStoreImpl.java | 312 +++++++++++
 .../hdfs/blobstore/HdfsClientBlobStore.java     | 130 +++++
 .../storm/hdfs/blobstore/BlobStoreTest.java     | 540 ++++++++++++++++++
 .../hdfs/blobstore/HdfsBlobStoreImplTest.java   | 224 ++++++++
 .../storm/hdfs/blobstore/HdfsBlobStore.java     | 395 --------------
 .../storm/hdfs/blobstore/HdfsBlobStoreFile.java | 196 -------
 .../storm/hdfs/blobstore/HdfsBlobStoreImpl.java | 312 -----------
 .../hdfs/blobstore/HdfsClientBlobStore.java     | 130 -----
 .../storm/hdfs/blobstore/BlobStoreTest.java     | 544 -------------------
 .../hdfs/blobstore/HdfsBlobStoreImplTest.java   | 226 --------
 .../apache/storm/kafka/spout/KafkaSpout.java    | 110 ++--
 .../storm/kafka/spout/KafkaSpoutConfig.java     | 131 ++---
 .../spout/internal/CommitMetadataManager.java   |  91 ++++
 .../storm/kafka/spout/KafkaSpoutConfigTest.java |  13 +
 .../spout/KafkaSpoutMessagingGuaranteeTest.java |  93 +++-
 pom.xml                                         |   3 +-
 .../jvm/org/apache/storm/executor/Executor.java |   1 -
 .../storm/executor/bolt/BoltExecutor.java       |   1 +
 .../storm/executor/spout/SpoutExecutor.java     |   1 +
 .../org/apache/storm/utils/NimbusClient.java    |   4 +-
 .../java/org/apache/storm/LocalCluster.java     |  13 +-
 .../storm/daemon/supervisor/Container.java      |  18 +-
 .../daemon/supervisor/OnlyLatestExecutor.java   |  60 ++
 .../daemon/supervisor/ReadClusterState.java     |   6 +-
 .../apache/storm/daemon/supervisor/Slot.java    |  33 +-
 .../storm/daemon/supervisor/Supervisor.java     |  16 +-
 .../storm/daemon/supervisor/SlotTest.java       |  15 +-
 39 files changed, 2670 insertions(+), 2046 deletions(-)
----------------------------------------------------------------------



[7/8] storm git commit: fix top-level pom

Posted by pt...@apache.org.
fix top-level pom


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

Branch: refs/heads/master
Commit: 062bb2f158a66b802a3ad7bdda14fb8f70cf9b88
Parents: 442372e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Sep 21 12:10:16 2018 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Sep 21 12:10:16 2018 -0400

----------------------------------------------------------------------
 examples/storm-elasticsearch-examples/pom.xml   |  8 +++-----
 examples/storm-hbase-examples/pom.xml           | 11 ++++------
 examples/storm-hdfs-examples/pom.xml            |  8 +++-----
 examples/storm-hive-examples/pom.xml            |  8 +++-----
 examples/storm-jdbc-examples/pom.xml            |  8 +++-----
 examples/storm-jms-examples/pom.xml             |  5 ++---
 examples/storm-kafka-client-examples/pom.xml    |  8 +++-----
 examples/storm-loadgen/pom.xml                  |  5 ++---
 examples/storm-mongodb-examples/pom.xml         |  8 +++-----
 examples/storm-mqtt-examples/pom.xml            |  5 ++---
 examples/storm-opentsdb-examples/pom.xml        |  8 +++-----
 examples/storm-perf/pom.xml                     |  8 +++-----
 examples/storm-pmml-examples/pom.xml            |  8 +++-----
 examples/storm-redis-examples/pom.xml           |  8 +++-----
 examples/storm-rocketmq-examples/pom.xml        |  8 +++-----
 examples/storm-solr-examples/pom.xml            |  8 +++-----
 examples/storm-starter/pom.xml                  |  8 +++-----
 external/storm-autocreds/pom.xml                |  6 ++----
 external/storm-blobstore-migration/pom.xml      |  5 ++---
 external/storm-cassandra/pom.xml                |  2 +-
 external/storm-elasticsearch/pom.xml            |  5 ++---
 external/storm-eventhubs/pom.xml                |  2 +-
 external/storm-hbase/pom.xml                    |  2 +-
 external/storm-hdfs-blobstore/pom.xml           |  2 +-
 external/storm-hdfs/pom.xml                     |  2 +-
 external/storm-hive/pom.xml                     |  5 ++---
 external/storm-jdbc/pom.xml                     |  2 +-
 external/storm-jms/pom.xml                      |  5 ++---
 external/storm-kafka-client/pom.xml             |  5 ++---
 external/storm-kafka-migration/pom.xml          |  5 ++---
 external/storm-kafka-monitor/pom.xml            |  6 ++----
 external/storm-kinesis/pom.xml                  |  6 ++----
 external/storm-metrics/pom.xml                  | 21 +++++++++-----------
 external/storm-mongodb/pom.xml                  |  2 +-
 external/storm-mqtt/pom.xml                     |  2 +-
 external/storm-opentsdb/pom.xml                 |  2 +-
 external/storm-pmml/pom.xml                     |  6 ++----
 external/storm-redis/pom.xml                    |  2 +-
 external/storm-rocketmq/pom.xml                 |  5 ++---
 external/storm-solr/pom.xml                     |  6 ++----
 flux/flux-core/pom.xml                          |  2 +-
 flux/flux-examples/pom.xml                      |  2 +-
 flux/flux-wrappers/pom.xml                      |  2 +-
 flux/pom.xml                                    |  2 +-
 integration-test/pom.xml                        | 11 ++++------
 pom.xml                                         | 10 +++++-----
 shaded-deps/pom.xml                             |  6 ++----
 sql/pom.xml                                     |  2 +-
 sql/storm-sql-core/pom.xml                      |  2 +-
 sql/storm-sql-external/storm-sql-hdfs/pom.xml   |  2 +-
 sql/storm-sql-external/storm-sql-kafka/pom.xml  |  2 +-
 .../storm-sql-mongodb/pom.xml                   |  2 +-
 sql/storm-sql-external/storm-sql-redis/pom.xml  |  2 +-
 sql/storm-sql-runtime/pom.xml                   |  2 +-
 .../maven-shade-clojure-transformer/pom.xml     |  2 +-
 storm-buildtools/storm-maven-plugins/pom.xml    |  5 ++---
 storm-checkstyle/pom.xml                        |  6 ++----
 storm-client/pom.xml                            |  6 ++----
 storm-clojure-test/pom.xml                      |  6 ++----
 storm-clojure/pom.xml                           |  8 +++-----
 storm-core/pom.xml                              |  6 +++---
 storm-dist/binary/final-package/pom.xml         |  2 +-
 storm-dist/binary/pom.xml                       |  2 +-
 storm-dist/binary/storm-client-bin/pom.xml      |  2 +-
 storm-dist/binary/storm-webapp-bin/pom.xml      |  2 +-
 storm-dist/source/pom.xml                       |  2 +-
 storm-multilang/javascript/pom.xml              |  5 ++---
 storm-multilang/python/pom.xml                  |  2 +-
 storm-multilang/ruby/pom.xml                    |  2 +-
 storm-server/pom.xml                            |  6 ++----
 storm-submit-tools/pom.xml                      |  6 ++----
 storm-webapp/pom.xml                            |  4 ++--
 72 files changed, 144 insertions(+), 215 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-elasticsearch-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-elasticsearch-examples/pom.xml b/examples/storm-elasticsearch-examples/pom.xml
index 0ac8ab0..ccff964 100644
--- a/examples/storm-elasticsearch-examples/pom.xml
+++ b/examples/storm-elasticsearch-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -82,10 +82,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-hbase-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-hbase-examples/pom.xml b/examples/storm-hbase-examples/pom.xml
index 16953e2..10e40c5 100644
--- a/examples/storm-hbase-examples/pom.xml
+++ b/examples/storm-hbase-examples/pom.xml
@@ -15,14 +15,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -75,10 +74,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-hdfs-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-hdfs-examples/pom.xml b/examples/storm-hdfs-examples/pom.xml
index 30b07e6..3b7e974 100644
--- a/examples/storm-hdfs-examples/pom.xml
+++ b/examples/storm-hdfs-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -74,10 +74,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-hive-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-hive-examples/pom.xml b/examples/storm-hive-examples/pom.xml
index c4cd803..b83a27e 100644
--- a/examples/storm-hive-examples/pom.xml
+++ b/examples/storm-hive-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -74,10 +74,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-jdbc-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-jdbc-examples/pom.xml b/examples/storm-jdbc-examples/pom.xml
index f65df94..cbb4e3a 100644
--- a/examples/storm-jdbc-examples/pom.xml
+++ b/examples/storm-jdbc-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -74,10 +74,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-jms-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-jms-examples/pom.xml b/examples/storm-jms-examples/pom.xml
index bcdda52..2b5df240 100644
--- a/examples/storm-jms-examples/pom.xml
+++ b/examples/storm-jms-examples/pom.xml
@@ -15,14 +15,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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>
 
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-kafka-client-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-kafka-client-examples/pom.xml b/examples/storm-kafka-client-examples/pom.xml
index 74d7614..71eb2ef 100644
--- a/examples/storm-kafka-client-examples/pom.xml
+++ b/examples/storm-kafka-client-examples/pom.xml
@@ -17,13 +17,11 @@
   ~   limitations under the License.
   -->
 
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -91,7 +89,7 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.apache.storm.kafka.trident.TridentKafkaClientWordCountNamedTopics</mainClass>
                                 </transformer>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-loadgen/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-loadgen/pom.xml b/examples/storm-loadgen/pom.xml
index ebca6b1..efe690a 100644
--- a/examples/storm-loadgen/pom.xml
+++ b/examples/storm-loadgen/pom.xml
@@ -15,13 +15,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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>
   <parent>
     <artifactId>storm</artifactId>
     <groupId>org.apache.storm</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>storm-loadgen</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-mongodb-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-mongodb-examples/pom.xml b/examples/storm-mongodb-examples/pom.xml
index 980488c..09893b8 100644
--- a/examples/storm-mongodb-examples/pom.xml
+++ b/examples/storm-mongodb-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -74,10 +74,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-mqtt-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-mqtt-examples/pom.xml b/examples/storm-mqtt-examples/pom.xml
index ef545b9..7e7ce29 100644
--- a/examples/storm-mqtt-examples/pom.xml
+++ b/examples/storm-mqtt-examples/pom.xml
@@ -15,8 +15,7 @@
  limitations under the License.
 -->
 
-<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">
+<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>
 
   <artifactId>storm-mqtt-examples</artifactId>
@@ -27,7 +26,7 @@
   <parent>
     <artifactId>storm</artifactId>
     <groupId>org.apache.storm</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-opentsdb-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-opentsdb-examples/pom.xml b/examples/storm-opentsdb-examples/pom.xml
index 7f6364b..1fa6b65 100644
--- a/examples/storm-opentsdb-examples/pom.xml
+++ b/examples/storm-opentsdb-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -74,10 +74,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-perf/pom.xml b/examples/storm-perf/pom.xml
index 30ea04f..868286b 100644
--- a/examples/storm-perf/pom.xml
+++ b/examples/storm-perf/pom.xml
@@ -15,14 +15,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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>
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -65,7 +63,7 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                             </transformers>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-pmml-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-pmml-examples/pom.xml b/examples/storm-pmml-examples/pom.xml
index 7fd181e..cb7499a 100644
--- a/examples/storm-pmml-examples/pom.xml
+++ b/examples/storm-pmml-examples/pom.xml
@@ -17,13 +17,11 @@
   ~   limitations under the License.
   -->
 
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -65,7 +63,7 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>org.apache.storm.pmml.JpmmlRunnerTestTopology</mainClass>
                                 </transformer>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-redis-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-redis-examples/pom.xml b/examples/storm-redis-examples/pom.xml
index aa51ecd..5cbfffd 100644
--- a/examples/storm-redis-examples/pom.xml
+++ b/examples/storm-redis-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -78,10 +78,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-rocketmq-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-rocketmq-examples/pom.xml b/examples/storm-rocketmq-examples/pom.xml
index 0d72034..59d57bd 100644
--- a/examples/storm-rocketmq-examples/pom.xml
+++ b/examples/storm-rocketmq-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -74,10 +74,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-solr-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-solr-examples/pom.xml b/examples/storm-solr-examples/pom.xml
index f615d1e..9cfcb3d 100644
--- a/examples/storm-solr-examples/pom.xml
+++ b/examples/storm-solr-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -95,10 +95,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/examples/storm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 6842fee..c395179 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   <parent>
       <artifactId>storm</artifactId>
       <groupId>org.apache.storm</groupId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>2.0.0</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -180,10 +180,8 @@
                     </goals>
                     <configuration>
                         <transformers>
-                            <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                             </transformer>
                         </transformers>
                     </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-autocreds/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml
index ddbb934..d5a3eff 100644
--- a/external/storm-autocreds/pom.xml
+++ b/external/storm-autocreds/pom.xml
@@ -15,13 +15,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-blobstore-migration/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/pom.xml b/external/storm-blobstore-migration/pom.xml
index bd1af90..3b521e6 100644
--- a/external/storm-blobstore-migration/pom.xml
+++ b/external/storm-blobstore-migration/pom.xml
@@ -15,14 +15,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-cassandra/pom.xml b/external/storm-cassandra/pom.xml
index 87471c8..115b1db 100644
--- a/external/storm-cassandra/pom.xml
+++ b/external/storm-cassandra/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/pom.xml b/external/storm-elasticsearch/pom.xml
index 2394bbb..866a50e 100644
--- a/external/storm-elasticsearch/pom.xml
+++ b/external/storm-elasticsearch/pom.xml
@@ -15,14 +15,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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>
 
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-eventhubs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml
index 0c7d3a8..861ca6d 100755
--- a/external/storm-eventhubs/pom.xml
+++ b/external/storm-eventhubs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 88becb3..5dd876d 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-hdfs-blobstore/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs-blobstore/pom.xml b/external/storm-hdfs-blobstore/pom.xml
index 132b453..8b7a169 100644
--- a/external/storm-hdfs-blobstore/pom.xml
+++ b/external/storm-hdfs-blobstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index cb5baa2..3c6a223 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-hive/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hive/pom.xml b/external/storm-hive/pom.xml
index 797fefd..2d30c59 100644
--- a/external/storm-hive/pom.xml
+++ b/external/storm-hive/pom.xml
@@ -15,14 +15,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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>
 
   <parent>
     <artifactId>storm</artifactId>
     <groupId>org.apache.storm</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml
index 2aaf598..c26da3d 100644
--- a/external/storm-jdbc/pom.xml
+++ b/external/storm-jdbc/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-jms/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml
index 387c052..9075e3a 100644
--- a/external/storm-jms/pom.xml
+++ b/external/storm-jms/pom.xml
@@ -15,13 +15,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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>
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index d3d1aab..4a10e76 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -16,14 +16,13 @@
         * See the License for the specific language governing permissions and
         * limitations under the License.
         */-->
-<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">
+<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>
 
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-kafka-migration/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-migration/pom.xml b/external/storm-kafka-migration/pom.xml
index 5b0d212..577ebf9 100644
--- a/external/storm-kafka-migration/pom.xml
+++ b/external/storm-kafka-migration/pom.xml
@@ -16,14 +16,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */-->
-<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">
+<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>
 
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-kafka-monitor/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-monitor/pom.xml b/external/storm-kafka-monitor/pom.xml
index eb9eb25..6c61854 100644
--- a/external/storm-kafka-monitor/pom.xml
+++ b/external/storm-kafka-monitor/pom.xml
@@ -16,13 +16,11 @@
         * See the License for the specific language governing permissions and
         * limitations under the License.
         */-->
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-kinesis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kinesis/pom.xml b/external/storm-kinesis/pom.xml
index dbb4446..8c9e02d 100644
--- a/external/storm-kinesis/pom.xml
+++ b/external/storm-kinesis/pom.xml
@@ -13,13 +13,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-metrics/pom.xml b/external/storm-metrics/pom.xml
index c1d49ac..138e207 100644
--- a/external/storm-metrics/pom.xml
+++ b/external/storm-metrics/pom.xml
@@ -20,7 +20,7 @@
   <parent>
       <artifactId>storm</artifactId>
       <groupId>org.apache.storm</groupId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>2.0.0</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -75,23 +75,20 @@
             <phase>validate</phase>
             <configuration>
               <tasks>
-                <echo message="Downloading sigar native binaries..."/>
-                <get src="${sigar.download.url}"
-                     dest="${sigar.download.path}/" skipExisting="true"/>
-                <checksum file="${sigar.download.path}/hyperic-sigar-${sigar.version}.zip" algorithm="SHA1"
-                          property="${sigar.SHA1}" verifyProperty="validChecksum"/>
+                <echo message="Downloading sigar native binaries..." />
+                <get src="${sigar.download.url}" dest="${sigar.download.path}/" skipExisting="true" />
+                <checksum file="${sigar.download.path}/hyperic-sigar-${sigar.version}.zip" algorithm="SHA1" property="${sigar.SHA1}" verifyProperty="validChecksum" />
                 <fail message="Checksum validation failed for hyperic-sigar-${sigar.version}.zip">
                   <condition>
-                    <isfalse value="${validChecksum}"/>
+                    <isfalse value="${validChecksum}" />
                   </condition>
                 </fail>
-                <unzip src="${sigar.download.path}/hyperic-sigar-${sigar.version}.zip"
-                       dest="${project.build.directory}/classes/resources">
+                <unzip src="${sigar.download.path}/hyperic-sigar-${sigar.version}.zip" dest="${project.build.directory}/classes/resources">
                   <patternset>
-                    <include name="**/lib/libsigar-*"/>
-                    <include name="**/lib/sigar-*"/>
+                    <include name="**/lib/libsigar-*" />
+                    <include name="**/lib/sigar-*" />
                   </patternset>
-                  <mapper type="flatten"/>
+                  <mapper type="flatten" />
                 </unzip>
               </tasks>
             </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-mongodb/pom.xml b/external/storm-mongodb/pom.xml
index f4b65dd..2d7f4e7 100644
--- a/external/storm-mongodb/pom.xml
+++ b/external/storm-mongodb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-mqtt/pom.xml b/external/storm-mqtt/pom.xml
index 2ae9e53..a3057b6 100644
--- a/external/storm-mqtt/pom.xml
+++ b/external/storm-mqtt/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.storm</groupId>
         <artifactId>storm</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-opentsdb/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-opentsdb/pom.xml b/external/storm-opentsdb/pom.xml
index cd372ce..1c7cb9e 100644
--- a/external/storm-opentsdb/pom.xml
+++ b/external/storm-opentsdb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-pmml/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-pmml/pom.xml b/external/storm-pmml/pom.xml
index 346e7a8..def8366 100644
--- a/external/storm-pmml/pom.xml
+++ b/external/storm-pmml/pom.xml
@@ -17,13 +17,11 @@
   ~   limitations under the License.
   -->
 
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-redis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml
index 52915d9..e23f313 100644
--- a/external/storm-redis/pom.xml
+++ b/external/storm-redis/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-rocketmq/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-rocketmq/pom.xml b/external/storm-rocketmq/pom.xml
index 7c2ae45..57ec38d 100644
--- a/external/storm-rocketmq/pom.xml
+++ b/external/storm-rocketmq/pom.xml
@@ -15,14 +15,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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>
 
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/external/storm-solr/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-solr/pom.xml b/external/storm-solr/pom.xml
index b65de8f..3e344a2 100644
--- a/external/storm-solr/pom.xml
+++ b/external/storm-solr/pom.xml
@@ -16,13 +16,11 @@
         * See the License for the specific language governing permissions and
         * limitations under the License.
         */-->
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/flux/flux-core/pom.xml
----------------------------------------------------------------------
diff --git a/flux/flux-core/pom.xml b/flux/flux-core/pom.xml
index f457562..c46fa90 100644
--- a/flux/flux-core/pom.xml
+++ b/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.storm</groupId>
         <artifactId>flux</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/flux/flux-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flux/flux-examples/pom.xml b/flux/flux-examples/pom.xml
index c084709..1941f23 100644
--- a/flux/flux-examples/pom.xml
+++ b/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.storm</groupId>
         <artifactId>flux</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/flux/flux-wrappers/pom.xml
----------------------------------------------------------------------
diff --git a/flux/flux-wrappers/pom.xml b/flux/flux-wrappers/pom.xml
index 103fb03..661d82b 100644
--- a/flux/flux-wrappers/pom.xml
+++ b/flux/flux-wrappers/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.storm</groupId>
         <artifactId>flux</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/flux/pom.xml
----------------------------------------------------------------------
diff --git a/flux/pom.xml b/flux/pom.xml
index 2e41147..fad2ac3 100644
--- a/flux/pom.xml
+++ b/flux/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 1d2252c..bb9c295 100755
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -15,14 +15,13 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<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">
+<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>
 
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -159,10 +158,8 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                 </transformer>
                             </transformers>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7d0ccd1..349d666 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
     <groupId>org.apache.storm</groupId>
     <artifactId>storm</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
     <packaging>pom</packaging>
     <name>Storm</name>
     <description>Distributed and fault-tolerant realtime computation</description>
@@ -81,7 +81,7 @@
             <roles>
                 <role>Committer</role>
             </roles>
-            <timezone/>
+            <timezone />
         </developer>
         <developer>
             <id>afeng</id>
@@ -108,7 +108,7 @@
             <roles>
                 <role>Committer</role>
             </roles>
-            <timezone/>
+            <timezone />
         </developer>
         <developer>
             <id>jjackson</id>
@@ -233,7 +233,7 @@
     <scm>
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>v2.0.0</tag>
         <url>https://git-wip-us.apache.org/repos/asf/storm</url>
     </scm>
 
@@ -600,7 +600,7 @@
                             <execution>
                                 <id>attach-javadocs</id>
                                 <goals>
-                                    <goal>javadoc-no-fork</goal>
+                                    <goal>javadoc</goal>
                                 </goals>
                             </execution>
                             <execution>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/shaded-deps/pom.xml
----------------------------------------------------------------------
diff --git a/shaded-deps/pom.xml b/shaded-deps/pom.xml
index 97ecebd..9b1a1c8 100644
--- a/shaded-deps/pom.xml
+++ b/shaded-deps/pom.xml
@@ -17,15 +17,13 @@
   ~ limitations under the License.
   -->
 
-<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">
+<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>
 
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/sql/pom.xml
----------------------------------------------------------------------
diff --git a/sql/pom.xml b/sql/pom.xml
index f085dd8..f98d29a 100644
--- a/sql/pom.xml
+++ b/sql/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/sql/storm-sql-core/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/pom.xml b/sql/storm-sql-core/pom.xml
index dfeb030..5c3771c 100644
--- a/sql/storm-sql-core/pom.xml
+++ b/sql/storm-sql-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/sql/storm-sql-external/storm-sql-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-hdfs/pom.xml b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
index 2695d56..d65cc4a 100644
--- a/sql/storm-sql-external/storm-sql-hdfs/pom.xml
+++ b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/sql/storm-sql-external/storm-sql-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-kafka/pom.xml b/sql/storm-sql-external/storm-sql-kafka/pom.xml
index 5f3d7c8..dcdd7be 100644
--- a/sql/storm-sql-external/storm-sql-kafka/pom.xml
+++ b/sql/storm-sql-external/storm-sql-kafka/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/sql/storm-sql-external/storm-sql-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-mongodb/pom.xml b/sql/storm-sql-external/storm-sql-mongodb/pom.xml
index ef75405..7e70588 100644
--- a/sql/storm-sql-external/storm-sql-mongodb/pom.xml
+++ b/sql/storm-sql-external/storm-sql-mongodb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/sql/storm-sql-external/storm-sql-redis/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-redis/pom.xml b/sql/storm-sql-external/storm-sql-redis/pom.xml
index 0e2646e..73fa951 100644
--- a/sql/storm-sql-external/storm-sql-redis/pom.xml
+++ b/sql/storm-sql-external/storm-sql-redis/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/sql/storm-sql-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/pom.xml b/sql/storm-sql-runtime/pom.xml
index 26b2773..260f23a 100644
--- a/sql/storm-sql-runtime/pom.xml
+++ b/sql/storm-sql-runtime/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/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 b1e5616..cf4e423 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/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 7ecffb3..3f97e20 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.
 -->
-<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">
+<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>
 
   <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/storm-checkstyle/pom.xml b/storm-checkstyle/pom.xml
index 1477abd..2ee33be 100644
--- a/storm-checkstyle/pom.xml
+++ b/storm-checkstyle/pom.xml
@@ -17,13 +17,11 @@
   ~ limitations under the License.
   -->
 
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 2e60d19..cefbb84 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -17,14 +17,12 @@
   ~ limitations under the License.
   -->
 
-<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">
+<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>
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-clojure-test/pom.xml
----------------------------------------------------------------------
diff --git a/storm-clojure-test/pom.xml b/storm-clojure-test/pom.xml
index 743b72b..e9957a4 100644
--- a/storm-clojure-test/pom.xml
+++ b/storm-clojure-test/pom.xml
@@ -15,14 +15,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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>
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>storm-clojure-test</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-clojure/pom.xml
----------------------------------------------------------------------
diff --git a/storm-clojure/pom.xml b/storm-clojure/pom.xml
index d436f19..af01d99 100644
--- a/storm-clojure/pom.xml
+++ b/storm-clojure/pom.xml
@@ -15,20 +15,18 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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>
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
     </parent>
 
     <artifactId>storm-clojure</artifactId>
 
     <properties>
-        <argLine></argLine>
+        <argLine />
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 7e44819..aee79c0 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -32,8 +32,8 @@
     <properties>
         <worker-launcher.conf.dir>/etc/storm</worker-launcher.conf.dir>
         <worker-launcher.build.dir>${project.build.directory}/native/worker-launcher</worker-launcher.build.dir>
-        <worker-launcher.additional_cflags></worker-launcher.additional_cflags>
-        <argLine></argLine>
+        <worker-launcher.additional_cflags />
+        <argLine />
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-dist/binary/final-package/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/final-package/pom.xml b/storm-dist/binary/final-package/pom.xml
index 71a4647..874c83a 100644
--- a/storm-dist/binary/final-package/pom.xml
+++ b/storm-dist/binary/final-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apache-storm-bin</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml
index 2b4cbba..8029f06 100644
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-dist/binary/storm-client-bin/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/storm-client-bin/pom.xml b/storm-dist/binary/storm-client-bin/pom.xml
index fc9f7f2..ea88694 100644
--- a/storm-dist/binary/storm-client-bin/pom.xml
+++ b/storm-dist/binary/storm-client-bin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apache-storm-bin</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-dist/binary/storm-webapp-bin/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/storm-webapp-bin/pom.xml b/storm-dist/binary/storm-webapp-bin/pom.xml
index f6cc5e1..6de25fe 100644
--- a/storm-dist/binary/storm-webapp-bin/pom.xml
+++ b/storm-dist/binary/storm-webapp-bin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apache-storm-bin</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-dist/source/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml
index 79d8a93..56043b5 100644
--- a/storm-dist/source/pom.xml
+++ b/storm-dist/source/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-multilang/javascript/pom.xml
----------------------------------------------------------------------
diff --git a/storm-multilang/javascript/pom.xml b/storm-multilang/javascript/pom.xml
index dad0854..42e19b6 100644
--- a/storm-multilang/javascript/pom.xml
+++ b/storm-multilang/javascript/pom.xml
@@ -16,13 +16,12 @@
  limitations under the License.
 -->
 
-<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">
+<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>
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-multilang/python/pom.xml
----------------------------------------------------------------------
diff --git a/storm-multilang/python/pom.xml b/storm-multilang/python/pom.xml
index d4a2bd4..ce83131 100644
--- a/storm-multilang/python/pom.xml
+++ b/storm-multilang/python/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-multilang/ruby/pom.xml
----------------------------------------------------------------------
diff --git a/storm-multilang/ruby/pom.xml b/storm-multilang/ruby/pom.xml
index f0cffd2..7933e57 100644
--- a/storm-multilang/ruby/pom.xml
+++ b/storm-multilang/ruby/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-server/pom.xml
----------------------------------------------------------------------
diff --git a/storm-server/pom.xml b/storm-server/pom.xml
index 67276a9..3bc389e 100644
--- a/storm-server/pom.xml
+++ b/storm-server/pom.xml
@@ -17,13 +17,11 @@
   ~ limitations under the License.
   -->
 
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-submit-tools/pom.xml
----------------------------------------------------------------------
diff --git a/storm-submit-tools/pom.xml b/storm-submit-tools/pom.xml
index 3b16e56..55f584d 100644
--- a/storm-submit-tools/pom.xml
+++ b/storm-submit-tools/pom.xml
@@ -13,13 +13,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<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">
+<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">
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/storm/blob/062bb2f1/storm-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/storm-webapp/pom.xml b/storm-webapp/pom.xml
index 84ec633..82d0bcb 100644
--- a/storm-webapp/pom.xml
+++ b/storm-webapp/pom.xml
@@ -21,7 +21,7 @@
 
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.storm</groupId>
             <artifactId>storm-core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.0</version>
             <scope>${provided.scope}</scope>
         </dependency>
         <dependency>


[6/8] storm git commit: fix typo in top-level pom

Posted by pt...@apache.org.
fix typo in top-level pom


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

Branch: refs/heads/master
Commit: 442372eb5b72ffda8171200db7d2c94ea87f28f5
Parents: e736c4b
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Sep 21 11:41:08 2018 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Sep 21 11:41:08 2018 -0400

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/442372eb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e26616f..7d0ccd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -600,7 +600,7 @@
                             <execution>
                                 <id>attach-javadocs</id>
                                 <goals>
-                                    <goal>jar-no-fork</goal>
+                                    <goal>javadoc-no-fork</goal>
                                 </goals>
                             </execution>
                             <execution>


[5/8] storm git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm

Posted by pt...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm


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

Branch: refs/heads/master
Commit: e736c4b44e94723be4c1efc06e4e9d2e9bd0314a
Parents: 9f72f8b b2a1a58
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Sep 20 18:17:31 2018 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Sep 20 18:17:31 2018 -0400

----------------------------------------------------------------------
 .travis.yml                                     |    11 +-
 DEVELOPER.md                                    |     2 -
 KEYS                                            |    79 +
 README.markdown                                 |     3 +-
 bin/storm-kafka-monitor                         |     2 +-
 bin/storm.py                                    |   101 +-
 conf/defaults.yaml                              |     9 +-
 conf/storm.yaml.example                         |    26 +-
 dev-tools/travis/travis-install.sh              |    11 +-
 dev-tools/travis/travis-script.sh               |    57 +-
 docs/Command-line-client.md                     |    46 +-
 docs/Hooks.md                                   |     4 +
 docs/Multilang-protocol.md                      |    12 +
 docs/Powered-By.md                              |  1038 -
 docs/Resource_Aware_Scheduler_overview.md       |     4 +
 docs/Structure-of-the-codebase.md               |    33 +-
 docs/Transactional-topologies.md                |     6 +-
 docs/Trident-state.md                           |     4 +-
 docs/Trident-tutorial.md                        |     2 +
 docs/Tutorial.md                                |     4 +-
 docs/flux.md                                    |    37 +-
 ...ql-internal-example-exported-from-drawio.xml |     2 +
 docs/images/storm-sql-internal-example.png      |   Bin 28377 -> 63265 bytes
 ...l-internal-workflow-exported-from-drawio.xml |     2 +
 docs/images/storm-sql-internal-workflow.png     |   Bin 20020 -> 42408 bytes
 docs/index.md                                   |     8 +-
 docs/metrics_v2.md                              |   147 +
 docs/storm-druid.md                             |   119 -
 docs/storm-kafka-client.md                      |    43 +-
 docs/storm-kafka.md                             |   399 -
 docs/storm-sql-example.md                       |    31 +-
 docs/storm-sql-internal.md                      |    20 +-
 docs/storm-sql-reference.md                     |    21 +-
 docs/storm-sql.md                               |    75 +-
 examples/storm-hbase-examples/README.md         |    62 +
 examples/storm-hbase-examples/pom.xml           |     5 +-
 .../storm/hbase/topology/LookupWordCount.java   |    28 +-
 .../hbase/topology/PersistentWordCount.java     |    38 +-
 .../storm/hbase/topology/TotalWordCounter.java  |    31 +-
 .../storm/hbase/topology/WordCountClient.java   |    21 +-
 .../hbase/topology/WordCountValueMapper.java    |    43 +-
 .../storm/hbase/topology/WordCounter.java       |    22 +-
 .../apache/storm/hbase/topology/WordSpout.java  |    28 +-
 .../storm/hbase/trident/PrintFunction.java      |    28 +-
 .../storm/hbase/trident/WordCountTrident.java   |    59 +-
 examples/storm-hdfs-examples/pom.xml            |     2 +-
 .../storm/hdfs/bolt/HdfsFileTopology.java       |    54 +-
 .../storm/hdfs/bolt/SequenceFileTopology.java   |    58 +-
 .../storm/hdfs/spout/HdfsSpoutTopology.java     |   307 +-
 .../storm/hdfs/trident/FixedBatchSpout.java     |    29 +-
 .../storm/hdfs/trident/TridentFileTopology.java |    30 +-
 .../hdfs/trident/TridentSequenceTopology.java   |    30 +-
 examples/storm-jms-examples/pom.xml             |    17 +-
 .../storm/jms/example/ExampleJmsTopology.java   |     1 -
 .../TridentKafkaClientTopologyNamedTopics.java  |    16 +-
 examples/storm-kafka-examples/pom.xml           |   110 -
 .../kafka/trident/KafkaProducerTopology.java    |    75 -
 .../trident/TridentKafkaConsumerTopology.java   |    42 -
 .../trident/TridentKafkaRandomStrings.java      |    82 -
 .../kafka/trident/TridentKafkaTopology.java     |    83 -
 examples/storm-loadgen/pom.xml                  |    21 +-
 .../java/org/apache/storm/loadgen/LoadBolt.java |     7 +-
 .../org/apache/storm/loadgen/LoadSpout.java     |    11 +-
 examples/storm-mqtt-examples/pom.xml            |    13 -
 .../mqtt/examples/CustomMessageMapper.java      |     4 +-
 examples/storm-perf/pom.xml                     |     6 +-
 .../perf/ConstSpoutIdBoltNullBoltTopo.java      |    12 +-
 .../storm/perf/ConstSpoutNullBoltTopo.java      |     4 +-
 .../storm/perf/FileReadWordCountTopo.java       |    33 +-
 .../storm/perf/HdfsSpoutNullBoltTopo.java       |     3 +-
 .../org/apache/storm/perf/JCQueuePerfTest.java  |    31 +-
 .../org/apache/storm/perf/JCToolsPerfTest.java  |    27 +-
 .../apache/storm/perf/KafkaClientHdfsTopo.java  |     8 +-
 .../perf/KafkaClientSpoutNullBoltTopo.java      |    15 +-
 .../apache/storm/perf/LowThroughputTopo.java    |     9 +-
 .../storm/perf/SimplifiedWordCountTopo.java     |     1 -
 .../storm/perf/StrGenSpoutHdfsBoltTopo.java     |     3 +-
 .../org/apache/storm/perf/ThroughputMeter.java  |    16 +-
 .../org/apache/storm/perf/bolt/CountBolt.java   |     1 -
 .../org/apache/storm/perf/bolt/DevNullBolt.java |     1 -
 .../java/org/apache/storm/perf/bolt/IdBolt.java |     1 -
 .../storm/perf/bolt/SplitSentenceBolt.java      |     1 -
 .../org/apache/storm/perf/spout/ConstSpout.java |     1 -
 .../apache/storm/perf/spout/FileReadSpout.java  |     1 -
 .../apache/storm/perf/spout/StringGenSpout.java |    27 +-
 .../apache/storm/perf/spout/WordGenSpout.java   |    62 +-
 .../storm/perf/utils/BasicMetricsCollector.java |    23 +-
 .../org/apache/storm/perf/utils/Helper.java     |     7 +-
 .../apache/storm/perf/utils/IdentityBolt.java   |     3 +-
 .../apache/storm/perf/utils/MetricsSample.java  |     3 +-
 examples/storm-rocketmq-examples/pom.xml        |     2 +-
 .../rocketmq/topology/WordCountTopology.java    |    35 +-
 .../storm/rocketmq/topology/WordCounter.java    |    14 +-
 .../rocketmq/trident/WordCountTrident.java      |    29 +-
 examples/storm-starter/pom.xml                  |     7 +-
 .../apache/storm/starter/AnchoredWordCount.java |    72 +-
 .../apache/storm/starter/BasicDRPCTopology.java |    49 +-
 .../starter/BlobStoreAPIWordCountTopology.java  |   276 +-
 .../storm/starter/ExclamationTopology.java      |    84 +-
 .../storm/starter/FastWordCountTopology.java    |   300 +-
 .../storm/starter/InOrderDeliveryTest.java      |   261 +-
 .../apache/storm/starter/JoinBoltExample.java   |    39 +-
 .../apache/storm/starter/LambdaTopology.java    |    24 +-
 .../org/apache/storm/starter/ManualDRPC.java    |    51 +-
 .../storm/starter/MultipleLoggerTopology.java   |   112 +-
 .../starter/PersistentWindowingTopology.java    |    99 +-
 .../org/apache/storm/starter/ReachTopology.java |    76 +-
 .../starter/ResourceAwareExampleTopology.java   |   113 +-
 .../apache/storm/starter/RollingTopWords.java   |   111 +-
 .../apache/storm/starter/SingleJoinExample.java |    26 +-
 .../storm/starter/SkewedRollingTopWords.java    |   113 +-
 .../storm/starter/SlidingTupleTsTopology.java   |    30 +-
 .../storm/starter/SlidingWindowTopology.java    |    62 +-
 .../apache/storm/starter/StatefulTopology.java  |    44 +-
 .../starter/StatefulWindowingTopology.java      |    46 +-
 .../storm/starter/TransactionalGlobalCount.java |   174 -
 .../storm/starter/TransactionalWords.java       |   244 -
 .../apache/storm/starter/WordCountTopology.java |   115 +-
 .../storm/starter/WordCountTopologyNode.java    |    61 +-
 .../storm/starter/bolt/AbstractRankerBolt.java  |   135 +-
 .../starter/bolt/IntermediateRankingsBolt.java  |    61 +-
 .../apache/storm/starter/bolt/PrinterBolt.java  |    33 +-
 .../storm/starter/bolt/RollingCountAggBolt.java |    92 +-
 .../storm/starter/bolt/RollingCountBolt.java    |   169 +-
 .../storm/starter/bolt/SingleJoinBolt.java      |   167 +-
 .../starter/bolt/SlidingWindowSumBolt.java      |    48 +-
 .../storm/starter/bolt/TotalRankingsBolt.java   |    63 +-
 .../storm/starter/spout/RandomIntegerSpout.java |    24 +-
 .../spout/RandomNumberGeneratorSpout.java       |    35 +-
 .../starter/spout/RandomSentenceSpout.java      |   120 +-
 .../storm/starter/streams/AggregateExample.java |    33 +-
 .../storm/starter/streams/BranchExample.java    |    45 +-
 .../streams/GroupByKeyAndWindowExample.java     |    62 +-
 .../storm/starter/streams/JoinExample.java      |    48 +-
 .../starter/streams/StateQueryExample.java      |    53 +-
 .../starter/streams/StatefulWordCount.java      |    59 +-
 .../starter/streams/TypedTupleExample.java      |    19 +-
 .../starter/streams/WindowedWordCount.java      |    70 +-
 .../storm/starter/streams/WordCountToBolt.java  |    51 +-
 .../tools/NthLastModifiedTimeTracker.java       |    75 +-
 .../apache/storm/starter/tools/Rankable.java    |    35 +-
 .../starter/tools/RankableObjectWithFields.java |   224 +-
 .../apache/storm/starter/tools/Rankings.java    |   238 +-
 .../starter/tools/SlidingWindowCounter.java     |   101 +-
 .../storm/starter/tools/SlotBasedCounter.java   |   144 +-
 .../starter/trident/DebugMemoryMapState.java    |     7 +-
 .../TridentHBaseWindowingStoreTopology.java     |    46 +-
 .../starter/trident/TridentMapExample.java      |    50 +-
 .../trident/TridentMinMaxOfDevicesTopology.java |    85 +-
 .../TridentMinMaxOfVehiclesTopology.java        |    83 +-
 .../storm/starter/trident/TridentReach.java     |    95 +-
 .../TridentWindowingInmemoryStoreTopology.java  |    43 +-
 .../storm/starter/trident/TridentWordCount.java |    58 +-
 .../bolt/IntermediateRankingsBoltTest.java      |   244 +-
 .../starter/bolt/RollingCountBoltTest.java      |   178 +-
 .../starter/bolt/TotalRankingsBoltTest.java     |   246 +-
 .../tools/NthLastModifiedTimeTrackerTest.java   |   158 +-
 .../tools/RankableObjectWithFieldsTest.java     |   489 +-
 .../storm/starter/tools/RankingsTest.java       |   668 +-
 .../starter/tools/SlidingWindowCounterTest.java |   175 +-
 .../starter/tools/SlotBasedCounterTest.java     |   320 +-
 external/storm-autocreds/pom.xml                |    11 +
 .../AbstractHadoopNimbusPluginAutoCreds.java    |     4 +-
 .../storm/hbase/security/HBaseSecurityUtil.java |    39 +-
 .../org/apache/storm/blobstore/ListHDFS.java    |     2 +-
 .../org/apache/storm/blobstore/ListLocalFs.java |     2 +-
 .../apache/storm/blobstore/MigrateBlobs.java    |     4 +-
 external/storm-cassandra/pom.xml                |     2 +-
 .../AbstractExecutionResultHandler.java         |    34 +-
 .../cassandra/BaseExecutionResultHandler.java   |    32 +-
 .../storm/cassandra/CassandraContext.java       |    28 +-
 .../cassandra/DynamicStatementBuilder.java      |    38 +-
 .../storm/cassandra/ExecutionResultHandler.java |    27 +-
 .../storm/cassandra/Murmur3StreamGrouping.java  |    87 +-
 .../storm/cassandra/bolt/BaseCassandraBolt.java |    42 +-
 .../bolt/BatchCassandraWriterBolt.java          |    80 +-
 .../cassandra/bolt/CassandraWriterBolt.java     |    34 +-
 .../cassandra/bolt/GroupingBatchBuilder.java    |    29 +-
 .../bolt/PairBatchStatementTuples.java          |    23 +-
 .../cassandra/bolt/PairStatementTuple.java      |    26 +-
 .../storm/cassandra/client/CassandraConf.java   |   191 +-
 .../storm/cassandra/client/ClusterFactory.java  |    46 +-
 .../storm/cassandra/client/SimpleClient.java    |    20 +-
 .../cassandra/client/SimpleClientProvider.java  |    20 +-
 .../cassandra/client/impl/DefaultClient.java    |    27 +-
 .../cassandra/context/BaseBeanFactory.java      |    25 +-
 .../storm/cassandra/context/BeanFactory.java    |    20 +-
 .../storm/cassandra/context/WorkerCtx.java      |    32 +-
 .../storm/cassandra/executor/AsyncExecutor.java |    98 +-
 .../executor/AsyncExecutorProvider.java         |    22 +-
 .../cassandra/executor/AsyncResultHandler.java  |    27 +-
 .../executor/AsyncResultSetHandler.java         |    23 +-
 .../executor/ExecutionResultCollector.java      |    36 +-
 .../executor/impl/BatchAsyncResultHandler.java  |    32 +-
 .../executor/impl/SingleAsyncResultHandler.java |    30 +-
 .../query/AyncCQLResultSetValuesMapper.java     |    25 +-
 .../query/BaseCQLStatementTupleMapper.java      |    23 +-
 .../query/CQLResultSetValuesMapper.java         |    25 +-
 .../cassandra/query/CQLStatementBuilder.java    |    20 +-
 .../query/CQLStatementTupleMapper.java          |    25 +-
 .../apache/storm/cassandra/query/Column.java    |    34 +-
 .../storm/cassandra/query/ContextQuery.java     |    23 +-
 .../apache/storm/cassandra/query/CqlMapper.java |    29 +-
 .../cassandra/query/ObjectMapperOperation.java  |    19 +-
 .../builder/BoundCQLStatementMapperBuilder.java |    33 +-
 .../ObjectMapperCqlStatementMapperBuilder.java  |    19 +-
 .../SimpleCQLStatementMapperBuilder.java        |    31 +-
 .../impl/BatchCQLStatementTupleMapper.java      |    29 +-
 .../impl/BoundCQLStatementTupleMapper.java      |    48 +-
 .../impl/ObjectMapperCqlStatementMapper.java    |    27 +-
 .../query/impl/PreparedStatementBinder.java     |    40 +-
 .../query/impl/RoutingKeyGenerator.java         |    25 +-
 .../query/impl/SimpleCQLStatementMapper.java    |    36 +-
 .../cassandra/query/selector/FieldSelector.java |    25 +-
 .../trident/state/CassandraBackingMap.java      |    49 +-
 .../trident/state/CassandraMapStateFactory.java |    29 +-
 .../cassandra/trident/state/CassandraQuery.java |    25 +-
 .../cassandra/trident/state/CassandraState.java |    91 +-
 .../trident/state/CassandraStateFactory.java    |    28 +-
 .../trident/state/CassandraStateUpdater.java    |    23 +-
 .../trident/state/MapStateFactoryBuilder.java   |    85 +-
 .../state/NonTransactionalTupleStateMapper.java |    23 +-
 .../trident/state/OpaqueTupleStateMapper.java   |    31 +-
 .../trident/state/SerializedStateMapper.java    |    31 +-
 .../trident/state/SimpleStateMapper.java        |    26 +-
 .../cassandra/trident/state/SimpleTuple.java    |    38 +-
 .../cassandra/trident/state/StateMapper.java    |    25 +-
 .../state/TransactionalTupleStateMapper.java    |    28 +-
 .../TridentAyncCQLResultSetValuesMapper.java    |    28 +-
 .../state/TridentResultSetValuesMapper.java     |    29 +-
 .../apache/storm/cassandra/WeatherSpout.java    |    25 +-
 .../testtools/EmbeddedCassandraResource.java    |    33 +-
 .../storm/cassandra/trident/MapStateTest.java   |   110 +-
 .../cassandra/trident/WeatherBatchSpout.java    |    43 +-
 external/storm-druid/README.md                  |   147 -
 external/storm-druid/pom.xml                    |   111 -
 .../apache/storm/druid/bolt/DruidBeamBolt.java  |   116 -
 .../storm/druid/bolt/DruidBeamFactory.java      |    29 -
 .../apache/storm/druid/bolt/DruidConfig.java    |   104 -
 .../druid/bolt/ITupleDruidEventMapper.java      |    38 -
 .../storm/druid/bolt/TupleDruidEventMapper.java |    44 -
 .../storm/druid/trident/DruidBeamState.java     |    96 -
 .../druid/trident/DruidBeamStateFactory.java    |    42 -
 .../druid/trident/DruidBeamStateUpdater.java    |    48 -
 .../storm/druid/SampleDruidBeamFactoryImpl.java |   122 -
 .../storm/druid/SampleDruidBoltTopology.java    |    94 -
 .../druid/SampleDruidBoltTridentTopology.java   |    90 -
 .../apache/storm/druid/SimpleBatchSpout.java    |    95 -
 .../org/apache/storm/druid/SimpleSpout.java     |    68 -
 external/storm-elasticsearch/pom.xml            |     7 +-
 .../DefaultEsLookupResultOutput.java            |    11 +-
 .../elasticsearch/EsLookupResultOutput.java     |     8 +-
 .../elasticsearch/bolt/AbstractEsBolt.java      |     7 +-
 .../storm/elasticsearch/bolt/EsIndexBolt.java   |     5 +-
 .../storm/elasticsearch/bolt/EsLookupBolt.java  |    12 +-
 .../elasticsearch/bolt/EsPercolateBolt.java     |     8 +-
 .../common/DefaultEsTupleMapper.java            |     2 +-
 .../storm/elasticsearch/common/EsConfig.java    |     8 +-
 .../elasticsearch/common/EsTupleMapper.java     |     5 +-
 .../common/StormElasticSearchClient.java        |     9 +
 .../apache/storm/elasticsearch/doc/Index.java   |     8 +
 .../storm/elasticsearch/doc/IndexDoc.java       |     1 +
 .../storm/elasticsearch/doc/IndexItem.java      |     1 +
 .../storm/elasticsearch/doc/IndexItemDoc.java   |     1 +
 .../apache/storm/elasticsearch/doc/Shards.java  |     1 +
 .../storm/elasticsearch/doc/SourceDoc.java      |     1 +
 .../response/BulkIndexResponse.java             |    11 +
 .../elasticsearch/response/LookupResponse.java  |     5 +-
 .../response/PercolateResponse.java             |     5 +-
 .../storm/elasticsearch/trident/EsState.java    |    21 +-
 .../elasticsearch/trident/EsStateFactory.java   |     4 +-
 .../storm/elasticsearch/trident/EsUpdater.java  |     5 +-
 external/storm-eventhubs/pom.xml                |     2 +-
 .../eventhubs/bolt/DefaultEventDataFormat.java  |    38 +-
 .../storm/eventhubs/bolt/EventHubBolt.java      |   208 +-
 .../eventhubs/bolt/EventHubBoltConfig.java      |   147 +-
 .../storm/eventhubs/bolt/IEventDataFormat.java  |     3 +-
 .../eventhubs/spout/BinaryEventDataScheme.java  |    78 +-
 .../storm/eventhubs/spout/EventDataScheme.java  |    92 +-
 .../storm/eventhubs/spout/EventDataWrap.java    |    51 +-
 .../storm/eventhubs/spout/EventHubFilter.java   |    11 +-
 .../eventhubs/spout/EventHubReceiverImpl.java   |   237 +-
 .../storm/eventhubs/spout/EventHubSpout.java    |   420 +-
 .../eventhubs/spout/EventHubSpoutConfig.java    |   451 +-
 .../storm/eventhubs/spout/FieldConstants.java   |    13 +-
 .../storm/eventhubs/spout/IEventDataScheme.java |    34 +-
 .../eventhubs/spout/IEventHubReceiver.java      |    11 +-
 .../spout/IEventHubReceiverFactory.java         |    27 +-
 .../eventhubs/spout/IPartitionCoordinator.java  |     5 +-
 .../eventhubs/spout/IPartitionManager.java      |    17 +-
 .../spout/IPartitionManagerFactory.java         |    33 +-
 .../storm/eventhubs/spout/IStateStore.java      |     9 +-
 .../apache/storm/eventhubs/spout/MessageId.java |    69 +-
 .../storm/eventhubs/spout/PartitionManager.java |   126 +-
 .../eventhubs/spout/SimplePartitionManager.java |   200 +-
 .../spout/StaticPartitionCoordinator.java       |    92 +-
 .../eventhubs/spout/StringEventDataScheme.java  |    78 +-
 .../eventhubs/spout/ZookeeperStateStore.java    |   107 +-
 .../storm/eventhubs/trident/Coordinator.java    |    65 +-
 .../trident/ITridentPartitionManager.java       |    26 +-
 .../ITridentPartitionManagerFactory.java        |     4 +-
 .../trident/OpaqueTridentEventHubEmitter.java   |    69 +-
 .../trident/OpaqueTridentEventHubSpout.java     |    65 +-
 .../storm/eventhubs/trident/Partition.java      |    23 +-
 .../storm/eventhubs/trident/Partitions.java     |    28 +-
 .../TransactionalTridentEventHubEmitter.java    |   240 +-
 .../TransactionalTridentEventHubSpout.java      |    64 +-
 .../trident/TridentPartitionManager.java        |   117 +-
 .../eventhubs/samples/AtMostOnceEventCount.java |    44 +-
 .../storm/eventhubs/samples/EventCount.java     |   208 +-
 .../storm/eventhubs/samples/EventHubLoop.java   |    44 +-
 .../samples/OpaqueTridentEventCount.java        |    45 +-
 .../samples/TransactionalTridentEventCount.java |    86 +-
 .../eventhubs/samples/bolt/GlobalCountBolt.java |    95 +-
 .../samples/bolt/PartialCountBolt.java          |    59 +-
 .../eventhubs/spout/EventHubReceiverMock.java   |    97 +-
 .../spout/EventHubSpoutCallerMock.java          |   130 +-
 .../spout/PartitionManagerCallerMock.java       |   134 +-
 .../spout/SpoutOutputCollectorMock.java         |    76 +-
 .../storm/eventhubs/spout/StateStoreMock.java   |    44 +-
 .../storm/eventhubs/spout/TestEventData.java    |    29 +-
 .../eventhubs/spout/TestEventHubSpout.java      |    82 +-
 .../eventhubs/spout/TestPartitionManager.java   |   178 +-
 .../TestTransactionalTridentEmitter.java        |   123 +-
 .../eventhubs/trident/TridentCollectorMock.java |    58 +-
 external/storm-hbase/pom.xml                    |    38 +-
 .../storm/hbase/bolt/AbstractHBaseBolt.java     |    48 +-
 .../org/apache/storm/hbase/bolt/HBaseBolt.java  |    42 +-
 .../storm/hbase/bolt/HBaseLookupBolt.java       |   161 +-
 .../storm/hbase/bolt/mapper/HBaseMapper.java    |    27 +-
 .../bolt/mapper/HBaseProjectionCriteria.java    |    75 +-
 .../hbase/bolt/mapper/HBaseValueMapper.java     |    31 +-
 .../hbase/bolt/mapper/SimpleHBaseMapper.java    |    55 +-
 .../apache/storm/hbase/common/ColumnList.java   |   166 +-
 .../apache/storm/hbase/common/HBaseClient.java  |    42 +-
 .../org/apache/storm/hbase/common/IColumn.java  |    26 +-
 .../org/apache/storm/hbase/common/ICounter.java |    25 +-
 .../org/apache/storm/hbase/common/Utils.java    |   122 +-
 .../storm/hbase/state/HBaseKeyValueState.java   |    36 +-
 .../hbase/state/HBaseKeyValueStateIterator.java |    42 +-
 .../hbase/state/HBaseKeyValueStateProvider.java |    33 +-
 .../mapper/SimpleTridentHBaseMapMapper.java     |     2 +-
 .../mapper/SimpleTridentHBaseMapper.java        |    45 +-
 .../trident/mapper/TridentHBaseMapper.java      |    34 +-
 .../hbase/trident/state/HBaseMapState.java      |   142 +-
 .../storm/hbase/trident/state/HBaseQuery.java   |    24 +-
 .../storm/hbase/trident/state/HBaseState.java   |   129 +-
 .../hbase/trident/state/HBaseStateFactory.java  |    24 +-
 .../storm/hbase/trident/state/HBaseUpdater.java |    24 +-
 .../trident/windowing/HBaseWindowsStore.java    |    65 +-
 .../windowing/HBaseWindowsStoreFactory.java     |    24 +-
 .../storm/hbase/state/HBaseClientTestUtil.java  |    53 +-
 .../state/HBaseKeyValueStateIteratorTest.java   |    28 +-
 .../state/HBaseKeyValueStateProviderTest.java   |    15 +-
 .../hbase/state/HBaseKeyValueStateTest.java     |    35 +-
 external/storm-hdfs-blobstore/pom.xml           |     5 +
 .../storm/hdfs/blobstore/HdfsBlobStore.java     |    44 +-
 .../hdfs/blobstore/HdfsClientBlobStore.java     |    12 +-
 external/storm-hdfs/pom.xml                     |     2 +-
 .../storm/hdfs/avro/AbstractAvroSerializer.java |    33 +-
 .../storm/hdfs/avro/AvroSchemaRegistry.java     |    22 +-
 .../org/apache/storm/hdfs/avro/AvroUtils.java   |    24 +-
 .../hdfs/avro/ConfluentAvroSerializer.java      |    24 +-
 .../storm/hdfs/avro/FixedAvroSerializer.java    |    30 +-
 .../storm/hdfs/avro/GenericAvroSerializer.java  |    19 +-
 .../storm/hdfs/bolt/AbstractHdfsBolt.java       |    79 +-
 .../storm/hdfs/bolt/AvroGenericRecordBolt.java  |    52 +-
 .../org/apache/storm/hdfs/bolt/HdfsBolt.java    |    51 +-
 .../storm/hdfs/bolt/SequenceFileBolt.java       |    50 +-
 .../java/org/apache/storm/hdfs/bolt/Writer.java |    18 +-
 .../hdfs/bolt/format/DefaultFileNameFormat.java |    32 +-
 .../hdfs/bolt/format/DefaultSequenceFormat.java |    12 +-
 .../hdfs/bolt/format/DelimitedRecordFormat.java |    29 +-
 .../storm/hdfs/bolt/format/FileNameFormat.java  |    22 +-
 .../storm/hdfs/bolt/format/RecordFormat.java    |    22 +-
 .../storm/hdfs/bolt/format/SequenceFormat.java  |     7 +-
 .../hdfs/bolt/format/SimpleFileNameFormat.java  |    38 +-
 .../hdfs/bolt/rotation/FileRotationPolicy.java  |    22 +-
 .../bolt/rotation/FileSizeRotationPolicy.java   |    62 +-
 .../hdfs/bolt/rotation/NoRotationPolicy.java    |    19 +-
 .../hdfs/bolt/rotation/TimedRotationPolicy.java |    43 +-
 .../storm/hdfs/bolt/sync/CountSyncPolicy.java   |    21 +-
 .../apache/storm/hdfs/bolt/sync/SyncPolicy.java |    22 +-
 .../storm/hdfs/common/AbstractHDFSWriter.java   |    22 +-
 .../common/AvroGenericRecordHDFSWriter.java     |    24 +-
 .../apache/storm/hdfs/common/HDFSWriter.java    |    26 +-
 .../org/apache/storm/hdfs/common/HdfsUtils.java |   137 +-
 .../storm/hdfs/common/ModifTimeComparator.java  |    27 +-
 .../storm/hdfs/common/NullPartitioner.java      |    19 +-
 .../apache/storm/hdfs/common/Partitioner.java   |    24 +-
 .../storm/hdfs/common/SequenceFileWriter.java   |    24 +-
 .../hdfs/common/rotation/MoveFileAction.java    |     6 +-
 .../hdfs/common/rotation/RotationAction.java    |     6 +-
 .../storm/hdfs/spout/AbstractFileReader.java    |    70 +-
 .../org/apache/storm/hdfs/spout/Configs.java    |    45 +-
 .../org/apache/storm/hdfs/spout/DirLock.java    |   182 +-
 .../org/apache/storm/hdfs/spout/FileLock.java   |   563 +-
 .../org/apache/storm/hdfs/spout/FileOffset.java |    25 +-
 .../org/apache/storm/hdfs/spout/FileReader.java |    49 +-
 .../org/apache/storm/hdfs/spout/HdfsSpout.java  |   166 +-
 .../apache/storm/hdfs/spout/ParseException.java |    24 +-
 .../storm/hdfs/spout/ProgressTracker.java       |    86 +-
 .../storm/hdfs/spout/SequenceFileReader.java    |   340 +-
 .../apache/storm/hdfs/spout/TextFileReader.java |   304 +-
 .../apache/storm/hdfs/trident/HdfsState.java    |   322 +-
 .../storm/hdfs/trident/HdfsStateFactory.java    |    12 +-
 .../apache/storm/hdfs/trident/HdfsUpdater.java  |     6 +-
 .../trident/format/DefaultFileNameFormat.java   |    29 +-
 .../trident/format/DefaultSequenceFormat.java   |    11 +-
 .../trident/format/DelimitedRecordFormat.java   |    31 +-
 .../hdfs/trident/format/FileNameFormat.java     |    19 +-
 .../storm/hdfs/trident/format/RecordFormat.java |    22 +-
 .../hdfs/trident/format/SequenceFormat.java     |     7 +-
 .../trident/format/SimpleFileNameFormat.java    |    36 +-
 .../trident/rotation/FileRotationPolicy.java    |    24 +-
 .../rotation/FileSizeRotationPolicy.java        |    64 +-
 .../hdfs/trident/rotation/NoRotationPolicy.java |    19 +-
 .../trident/rotation/TimedRotationPolicy.java   |    49 +-
 .../hdfs/trident/sync/CountSyncPolicy.java      |    21 +-
 .../storm/hdfs/trident/sync/SyncPolicy.java     |    22 +-
 .../hdfs/avro/TestFixedAvroSerializer.java      |    44 +-
 .../hdfs/avro/TestGenericAvroSerializer.java    |    33 +-
 .../hdfs/bolt/AvroGenericRecordBoltTest.java    |   129 +-
 .../apache/storm/hdfs/bolt/TestHdfsBolt.java    |   135 +-
 .../storm/hdfs/bolt/TestSequenceFileBolt.java   |   115 +-
 .../apache/storm/hdfs/bolt/TestWritersMap.java  |    22 +-
 .../bolt/format/TestSimpleFileNameFormat.java   |    39 +-
 .../apache/storm/hdfs/spout/ConfigsTest.java    |    46 +-
 .../apache/storm/hdfs/spout/TestDirLock.java    |    29 +-
 .../apache/storm/hdfs/spout/TestFileLock.java   |    47 +-
 .../storm/hdfs/spout/TestHdfsSemantics.java     |    35 +-
 .../apache/storm/hdfs/spout/TestHdfsSpout.java  |   229 +-
 .../storm/hdfs/spout/TestProgressTracker.java   |    21 +-
 .../storm/hdfs/testing/MiniDFSClusterRule.java  |     8 +-
 .../storm/hdfs/trident/HdfsStateTest.java       |   103 +-
 .../format/TestSimpleFileNameFormat.java        |    30 +-
 external/storm-hive/pom.xml                     |    14 +-
 .../org/apache/storm/hive/bolt/HiveBolt.java    |   141 +-
 .../bolt/mapper/DelimitedRecordHiveMapper.java  |    66 +-
 .../storm/hive/bolt/mapper/HiveMapper.java      |    30 +-
 .../hive/bolt/mapper/JsonRecordHiveMapper.java  |    61 +-
 .../apache/storm/hive/common/HiveOptions.java   |    24 +-
 .../org/apache/storm/hive/common/HiveUtils.java |    60 +-
 .../apache/storm/hive/common/HiveWriter.java    |   257 +-
 .../apache/storm/hive/trident/HiveState.java    |   124 +-
 .../storm/hive/trident/HiveStateFactory.java    |    31 +-
 .../apache/storm/hive/trident/HiveUpdater.java  |    23 +-
 .../apache/storm/hive/bolt/HiveSetupUtil.java   |   143 +-
 .../apache/storm/hive/bolt/TestHiveBolt.java    |   524 +-
 .../storm/hive/common/TestHiveWriter.java       |   203 +-
 external/storm-jdbc/pom.xml                     |     4 +-
 .../storm/jdbc/bolt/AbstractJdbcBolt.java       |    55 +-
 .../apache/storm/jdbc/bolt/JdbcInsertBolt.java  |    42 +-
 .../apache/storm/jdbc/bolt/JdbcLookupBolt.java  |    29 +-
 .../org/apache/storm/jdbc/common/Column.java    |    27 +-
 .../storm/jdbc/common/ConnectionProvider.java   |    19 +-
 .../jdbc/common/HikariCPConnectionProvider.java |    30 +-
 .../apache/storm/jdbc/common/JdbcClient.java    |    39 +-
 .../java/org/apache/storm/jdbc/common/Util.java |    19 +-
 .../storm/jdbc/mapper/JdbcLookupMapper.java     |    24 +-
 .../apache/storm/jdbc/mapper/JdbcMapper.java    |    24 +-
 .../jdbc/mapper/SimpleJdbcLookupMapper.java     |    36 +-
 .../storm/jdbc/mapper/SimpleJdbcMapper.java     |    57 +-
 .../storm/jdbc/trident/state/JdbcQuery.java     |    24 +-
 .../storm/jdbc/trident/state/JdbcState.java     |   141 +-
 .../jdbc/trident/state/JdbcStateFactory.java    |    24 +-
 .../storm/jdbc/trident/state/JdbcUpdater.java   |    24 +-
 .../storm/jdbc/bolt/JdbcInsertBoltTest.java     |    28 +-
 .../storm/jdbc/bolt/JdbcLookupBoltTest.java     |    29 +-
 .../storm/jdbc/common/JdbcClientTest.java       |    63 +-
 .../org/apache/storm/jdbc/common/UtilTest.java  |    22 +-
 external/storm-jms/pom.xml                      |    17 +-
 .../apache/storm/jms/JmsMessageProducer.java    |    21 +-
 .../java/org/apache/storm/jms/JmsProvider.java  |    20 +-
 .../org/apache/storm/jms/JmsTupleProducer.java  |    21 +-
 .../java/org/apache/storm/jms/bolt/JmsBolt.java |    38 +-
 .../apache/storm/jms/spout/JmsMessageID.java    |    29 +-
 .../org/apache/storm/jms/spout/JmsSpout.java    |   518 +-
 .../org/apache/storm/jms/trident/JmsBatch.java  |    19 +-
 .../org/apache/storm/jms/trident/JmsState.java  |   103 +-
 .../storm/jms/trident/JmsStateFactory.java      |    22 +-
 .../apache/storm/jms/trident/JmsUpdater.java    |    26 +-
 .../storm/jms/trident/TridentJmsSpout.java      |   237 +-
 .../apache/storm/jms/spout/JmsSpoutTest.java    |    38 +-
 .../apache/storm/jms/spout/MockJmsProvider.java |    21 +-
 .../jms/spout/MockSpoutOutputCollector.java     |     6 +-
 .../storm/jms/spout/MockTupleProducer.java      |     2 +-
 external/storm-kafka-client/pom.xml             |     8 +
 .../org/apache/storm/kafka/bolt/KafkaBolt.java  |    62 +-
 .../storm/kafka/bolt/PreparableCallback.java    |    32 +
 .../kafka/spout/EmptyKafkaTupleListener.java    |     1 -
 .../apache/storm/kafka/spout/KafkaSpout.java    |   137 +-
 .../storm/kafka/spout/KafkaSpoutConfig.java     |     1 -
 .../storm/kafka/spout/KafkaTupleListener.java   |     1 -
 .../kafka/spout/SimpleRecordTranslator.java     |     6 +-
 .../kafka/spout/internal/ConsumerFactory.java   |    28 +
 .../spout/internal/ConsumerFactoryDefault.java  |    29 +
 .../spout/internal/KafkaConsumerFactory.java    |    28 -
 .../internal/KafkaConsumerFactoryDefault.java   |    29 -
 .../kafka/spout/internal/OffsetManager.java     |     2 -
 .../kafka/spout/metrics/KafkaOffsetMetric.java  |    18 +-
 .../spout/subscription/NamedTopicFilter.java    |    16 +-
 .../spout/subscription/PatternTopicFilter.java  |     7 +-
 .../kafka/spout/subscription/TopicAssigner.java |     5 +-
 .../kafka/spout/subscription/TopicFilter.java   |     4 +-
 .../trident/KafkaTridentOpaqueSpoutEmitter.java |    68 +
 .../trident/KafkaTridentSpoutBatchMetadata.java |    23 +-
 .../trident/KafkaTridentSpoutCoordinator.java   |    97 +
 .../spout/trident/KafkaTridentSpoutEmitter.java |   247 +-
 .../spout/trident/KafkaTridentSpoutOpaque.java  |    18 +-
 .../KafkaTridentSpoutOpaqueCoordinator.java     |    94 -
 .../trident/KafkaTridentSpoutTransactional.java |    65 +
 .../KafkaTridentTransactionalSpoutEmitter.java  |    68 +
 .../trident/internal/OutputFieldsExtractor.java |    41 +
 .../java/org/apache/storm/kafka/KafkaUnit.java  |     6 +-
 .../apache/storm/kafka/KafkaUnitExtension.java  |    45 +
 .../org/apache/storm/kafka/KafkaUnitRule.java   |    45 -
 .../storm/kafka/NullRecordTranslator.java       |    36 +
 .../apache/storm/kafka/bolt/KafkaBoltTest.java  |   146 +-
 .../spout/ByTopicRecordTranslatorTest.java      |     8 +
 .../kafka/spout/KafkaSpoutAbstractTest.java     |    67 +-
 .../storm/kafka/spout/KafkaSpoutConfigTest.java |    31 +-
 .../storm/kafka/spout/KafkaSpoutEmitTest.java   |    18 +-
 .../KafkaSpoutLogCompactionSupportTest.java     |    39 +-
 .../spout/KafkaSpoutMessagingGuaranteeTest.java |    58 +-
 .../kafka/spout/KafkaSpoutNullTupleTest.java    |    40 +-
 .../kafka/spout/KafkaSpoutReactivationTest.java |    88 +-
 .../kafka/spout/KafkaSpoutRebalanceTest.java    |    32 +-
 .../kafka/spout/KafkaSpoutRetryLimitTest.java   |    19 +-
 .../kafka/spout/KafkaSpoutSingleTopicTest.java  |    57 +-
 ...outTopologyDeployActivateDeactivateTest.java |    11 +-
 .../kafka/spout/MaxUncommittedOffsetTest.java   |    41 +-
 .../kafka/spout/SimpleRecordTranslatorTest.java |    44 +
 .../spout/SingleTopicKafkaUnitSetupHelper.java  |     4 +-
 .../SpoutWithMockedConsumerSetupHelper.java     |     4 +-
 .../kafka/spout/internal/OffsetManagerTest.java |    17 +-
 .../subscription/NamedTopicFilterTest.java      |    15 +
 .../KafkaTridentSpoutBatchMetadataTest.java     |    10 +-
 .../trident/KafkaTridentSpoutEmitterTest.java   |   190 +-
 .../KafkaTridentSpoutOpaqueCoordinatorTest.java |     9 +-
 external/storm-kafka-migration/pom.xml          |     4 +
 external/storm-kafka-monitor/pom.xml            |     7 +-
 .../kafka/monitor/KafkaOffsetLagResult.java     |    14 +-
 .../storm/kafka/monitor/KafkaOffsetLagUtil.java |   311 +-
 .../kafka/monitor/KafkaPartitionOffsetLag.java  |    81 +-
 .../kafka/monitor/NewKafkaSpoutOffsetQuery.java |    12 +-
 .../kafka/monitor/OldKafkaSpoutOffsetQuery.java |   124 -
 external/storm-kafka/README.md                  |   382 -
 external/storm-kafka/pom.xml                    |   125 -
 .../src/jvm/org/apache/storm/kafka/Broker.java  |    86 -
 .../jvm/org/apache/storm/kafka/BrokerHosts.java |    25 -
 .../storm/kafka/ByteBufferSerializer.java       |    41 -
 .../storm/kafka/DynamicBrokersReader.java       |   214 -
 .../kafka/DynamicPartitionConnections.java      |    98 -
 .../ExponentialBackoffMsgRetryManager.java      |   206 -
 .../storm/kafka/FailedFetchException.java       |    29 -
 .../storm/kafka/FailedMsgRetryManager.java      |    82 -
 .../org/apache/storm/kafka/IntSerializer.java   |    42 -
 .../jvm/org/apache/storm/kafka/KafkaConfig.java |    56 -
 .../jvm/org/apache/storm/kafka/KafkaError.java  |    43 -
 .../jvm/org/apache/storm/kafka/KafkaSpout.java  |   261 -
 .../jvm/org/apache/storm/kafka/KafkaUtils.java  |   293 -
 .../org/apache/storm/kafka/KeyValueScheme.java  |    27 -
 .../kafka/KeyValueSchemeAsMultiScheme.java      |    38 -
 .../storm/kafka/MessageMetadataScheme.java      |    27 -
 .../MessageMetadataSchemeAsMultiScheme.java     |    41 -
 .../jvm/org/apache/storm/kafka/Partition.java   |    88 -
 .../storm/kafka/PartitionCoordinator.java       |    28 -
 .../apache/storm/kafka/PartitionManager.java    |   402 -
 .../jvm/org/apache/storm/kafka/SpoutConfig.java |    63 -
 .../apache/storm/kafka/StaticCoordinator.java   |    53 -
 .../jvm/org/apache/storm/kafka/StaticHosts.java |    38 -
 .../storm/kafka/StaticPartitionConnections.java |    52 -
 .../storm/kafka/StringKeyValueScheme.java       |    38 -
 .../kafka/StringMessageAndMetadataScheme.java   |    43 -
 .../storm/kafka/StringMultiSchemeWithTopic.java |    47 -
 .../org/apache/storm/kafka/StringScheme.java    |    50 -
 .../kafka/TopicOffsetOutOfRangeException.java   |    25 -
 .../org/apache/storm/kafka/ZkCoordinator.java   |   127 -
 .../src/jvm/org/apache/storm/kafka/ZkHosts.java |    36 -
 .../src/jvm/org/apache/storm/kafka/ZkState.java |   117 -
 .../org/apache/storm/kafka/bolt/KafkaBolt.java  |   181 -
 .../FieldNameBasedTupleToKafkaMapper.java       |    48 -
 .../kafka/bolt/mapper/TupleToKafkaMapper.java   |    32 -
 .../bolt/selector/DefaultTopicSelector.java     |    34 -
 .../bolt/selector/FieldIndexTopicSelector.java  |    48 -
 .../bolt/selector/FieldNameTopicSelector.java   |    49 -
 .../kafka/bolt/selector/KafkaTopicSelector.java |    26 -
 .../apache/storm/kafka/trident/Coordinator.java |    51 -
 .../storm/kafka/trident/DefaultCoordinator.java |    31 -
 .../trident/GlobalPartitionInformation.java     |   116 -
 .../storm/kafka/trident/IBatchCoordinator.java  |    26 -
 .../storm/kafka/trident/IBrokerReader.java      |    30 -
 .../apache/storm/kafka/trident/MaxMetric.java   |    40 -
 .../kafka/trident/OpaqueTridentKafkaSpout.java  |    68 -
 .../storm/kafka/trident/StaticBrokerReader.java |    49 -
 .../trident/TransactionalTridentKafkaSpout.java |    56 -
 .../storm/kafka/trident/TridentKafkaConfig.java |    37 -
 .../kafka/trident/TridentKafkaEmitter.java      |   309 -
 .../storm/kafka/trident/TridentKafkaState.java  |   115 -
 .../kafka/trident/TridentKafkaStateFactory.java |    63 -
 .../kafka/trident/TridentKafkaUpdater.java      |    31 -
 .../storm/kafka/trident/ZkBrokerReader.java     |    84 -
 .../FieldNameBasedTupleToKafkaMapper.java       |    41 -
 .../mapper/TridentTupleToKafkaMapper.java       |    28 -
 .../trident/selector/DefaultTopicSelector.java  |    34 -
 .../trident/selector/KafkaTopicSelector.java    |    26 -
 .../storm/kafka/DynamicBrokersReaderTest.java   |   252 -
 .../ExponentialBackoffMsgRetryManagerTest.java  |   284 -
 .../org/apache/storm/kafka/KafkaErrorTest.java  |    56 -
 .../org/apache/storm/kafka/KafkaTestBroker.java |   182 -
 .../org/apache/storm/kafka/KafkaUtilsTest.java  |   295 -
 .../storm/kafka/PartitionManagerTest.java       |   247 -
 .../storm/kafka/StringKeyValueSchemeTest.java   |    62 -
 .../apache/storm/kafka/TestStringScheme.java    |    40 -
 .../test/org/apache/storm/kafka/TestUtils.java  |    99 -
 .../apache/storm/kafka/TridentKafkaTest.java    |    81 -
 .../apache/storm/kafka/ZkCoordinatorTest.java   |   184 -
 .../apache/storm/kafka/bolt/KafkaBoltTest.java  |   344 -
 external/storm-mongodb/pom.xml                  |     5 -
 external/storm-mqtt/pom.xml                     |     8 +-
 .../java/org/apache/storm/mqtt/MqttLogger.java  |    20 +-
 .../java/org/apache/storm/mqtt/MqttMessage.java |    26 +-
 .../apache/storm/mqtt/MqttMessageMapper.java    |    22 +-
 .../org/apache/storm/mqtt/MqttTupleMapper.java  |    24 +-
 .../org/apache/storm/mqtt/bolt/MqttBolt.java    |    36 +-
 .../apache/storm/mqtt/common/MqttOptions.java   |    43 +-
 .../apache/storm/mqtt/common/MqttPublisher.java |    28 +-
 .../org/apache/storm/mqtt/common/MqttUtils.java |    34 +-
 .../org/apache/storm/mqtt/common/SslUtils.java  |    36 +-
 .../mqtt/mappers/ByteArrayMessageMapper.java    |    23 +-
 .../storm/mqtt/mappers/StringMessageMapper.java |    23 +-
 .../apache/storm/mqtt/spout/AckableMessage.java |    49 +-
 .../org/apache/storm/mqtt/spout/MqttSpout.java  |    86 +-
 .../storm/mqtt/ssl/DefaultKeyStoreLoader.java   |    25 +-
 .../apache/storm/mqtt/ssl/KeyStoreLoader.java   |    23 +-
 .../storm/mqtt/trident/MqttPublishFunction.java |    33 +-
 .../storm/mqtt/StormMqttIntegrationTest.java    |    75 +-
 external/storm-opentsdb/pom.xml                 |    16 +-
 external/storm-redis/pom.xml                    |     7 +-
 .../storm/redis/bolt/AbstractRedisBolt.java     |    28 +-
 .../storm/redis/bolt/RedisFilterBolt.java       |    22 +-
 .../storm/redis/bolt/RedisLookupBolt.java       |    30 +-
 .../apache/storm/redis/bolt/RedisStoreBolt.java |    19 +-
 .../adapter/RedisCommandsAdapterJedis.java      |     7 +-
 .../RedisCommandsAdapterJedisCluster.java       |     7 +-
 .../redis/common/commands/RedisCommands.java    |     9 +-
 .../redis/common/config/JedisClusterConfig.java |    23 +-
 .../redis/common/config/JedisPoolConfig.java    |    44 +-
 .../common/container/JedisClusterContainer.java |    21 +-
 .../JedisCommandsContainerBuilder.java          |    26 +-
 .../JedisCommandsInstanceContainer.java         |    21 +-
 .../redis/common/container/JedisContainer.java  |    23 +-
 .../common/container/RedisClusterContainer.java |     4 +-
 .../RedisCommandsContainerBuilder.java          |    10 +-
 .../RedisCommandsInstanceContainer.java         |     6 +-
 .../redis/common/container/RedisContainer.java  |     6 +-
 .../common/mapper/RedisDataTypeDescription.java |    26 +-
 .../redis/common/mapper/RedisFilterMapper.java  |    19 +-
 .../redis/common/mapper/RedisLookupMapper.java  |    22 +-
 .../storm/redis/common/mapper/RedisMapper.java  |    19 +-
 .../redis/common/mapper/RedisStoreMapper.java   |    19 +-
 .../storm/redis/common/mapper/TupleMapper.java  |    22 +-
 .../storm/redis/state/RedisKeyValueState.java   |    62 +-
 .../redis/state/RedisKeyValueStateIterator.java |    22 +-
 .../redis/state/RedisKeyValueStateProvider.java |    42 +-
 .../trident/state/AbstractRedisMapState.java    |    37 +-
 .../state/AbstractRedisStateQuerier.java        |    25 +-
 .../state/AbstractRedisStateUpdater.java        |    30 +-
 .../storm/redis/trident/state/KeyFactory.java   |    21 +-
 .../storm/redis/trident/state/Options.java      |    24 +-
 .../trident/state/RedisClusterMapState.java     |   213 +-
 .../redis/trident/state/RedisClusterState.java  |    99 +-
 .../trident/state/RedisClusterStateQuerier.java |    23 +-
 .../trident/state/RedisClusterStateUpdater.java |    48 +-
 .../redis/trident/state/RedisMapState.java      |   264 +-
 .../storm/redis/trident/state/RedisState.java   |    92 +-
 .../redis/trident/state/RedisStateQuerier.java  |    38 +-
 .../redis/trident/state/RedisStateUpdater.java  |    48 +-
 .../state/RedisKeyValueStateIteratorTest.java   |    69 +-
 .../state/RedisKeyValueStateProviderTest.java   |    34 +-
 .../redis/state/RedisKeyValueStateTest.java     |   186 +-
 external/storm-rocketmq/README.md               |    36 +-
 external/storm-rocketmq/pom.xml                 |    14 +-
 .../storm/rocketmq/ConsumerBatchMessage.java    |    65 +
 .../apache/storm/rocketmq/ConsumerMessage.java  |    61 -
 .../rocketmq/DefaultMessageBodySerializer.java  |     2 +-
 .../rocketmq/DefaultMessageRetryManager.java    |    98 -
 .../storm/rocketmq/MessageRetryManager.java     |    51 -
 .../apache/storm/rocketmq/RocketMqConfig.java   |    62 +-
 .../apache/storm/rocketmq/RocketMqUtils.java    |     4 +
 .../org/apache/storm/rocketmq/SpoutConfig.java  |     8 +-
 .../storm/rocketmq/bolt/RocketMqBolt.java       |   158 +-
 .../common/selector/DefaultTopicSelector.java   |     3 +-
 .../storm/rocketmq/spout/RocketMqSpout.java     |   135 +-
 .../rocketmq/spout/scheme/StringScheme.java     |     5 +-
 .../rocketmq/trident/state/RocketMqState.java   |    45 +-
 .../DefaultMessageBodySerializerTest.java       |    36 +
 .../storm/rocketmq/TestMessageRetryManager.java |   107 -
 .../org/apache/storm/rocketmq/TestUtils.java    |    45 +
 .../storm/rocketmq/bolt/RocketMqBoltTest.java   |    67 +
 .../FieldNameBasedTupleToMessageMapperTest.java |    36 +
 .../selector/DefaultTopicSelectorTest.java      |    41 +
 .../FieldNameBasedTopicSelectorTest.java        |    40 +
 .../storm/rocketmq/spout/RocketMqSpoutTest.java |    87 +
 .../spout/scheme/StringKeyValueSchemeTest.java  |    63 +
 external/storm-solr/pom.xml                     |     2 +-
 .../apache/storm/solr/bolt/SolrUpdateBolt.java  |    30 +-
 .../storm/solr/config/CountBasedCommit.java     |    18 +-
 .../storm/solr/config/SolrCommitStrategy.java   |    18 +-
 .../apache/storm/solr/config/SolrConfig.java    |    25 +-
 .../storm/solr/mapper/SolrFieldsMapper.java     |   137 +-
 .../storm/solr/mapper/SolrJsonMapper.java       |   119 +-
 .../apache/storm/solr/mapper/SolrMapper.java    |    22 +-
 .../storm/solr/mapper/SolrMapperException.java  |    18 +-
 .../org/apache/storm/solr/schema/CopyField.java |    32 +-
 .../org/apache/storm/solr/schema/Field.java     |    32 +-
 .../org/apache/storm/solr/schema/FieldType.java |    43 +-
 .../org/apache/storm/solr/schema/Schema.java    |    82 +-
 .../storm/solr/schema/SolrFieldTypeFinder.java  |    87 +-
 .../schema/builder/RestJsonSchemaBuilder.java   |    21 +-
 .../schema/builder/RestJsonSchemaBuilderV2.java |    49 +-
 .../solr/schema/builder/SchemaBuilder.java      |    20 +-
 .../apache/storm/solr/trident/SolrState.java    |    24 +-
 .../storm/solr/trident/SolrStateFactory.java    |    19 +-
 .../apache/storm/solr/trident/SolrUpdater.java  |    21 +-
 flux/flux-core/pom.xml                          |     5 +
 .../java/org/apache/storm/flux/FluxBuilder.java |     6 +-
 .../java/org/apache/storm/flux/TCKTest.java     |    39 +-
 .../org/apache/storm/flux/test/TestBolt.java    |     4 +
 .../configs/bad_static_factory_test.yaml        |    56 +
 flux/flux-examples/pom.xml                      |     4 +
 flux/pom.xml                                    |     5 -
 integration-test/config/Vagrantfile             |     6 +-
 integration-test/config/storm-java9.yaml        |    20 +
 integration-test/pom.xml                        |     4 +
 integration-test/run-it.sh                      |    29 +-
 .../storm/st/topology/TestableTopology.java     |     6 +-
 .../st/topology/window/IncrementingSpout.java   |    75 +
 .../topology/window/SlidingTimeCorrectness.java |   107 +-
 .../window/SlidingWindowCorrectness.java        |    89 +-
 .../window/TimeDataIncrementingSpout.java       |    63 +
 .../window/TimeDataVerificationBolt.java        |    69 +
 .../window/TumblingTimeCorrectness.java         |   107 +-
 .../window/TumblingWindowCorrectness.java       |    89 +-
 .../st/topology/window/VerificationBolt.java    |    63 +
 .../storm/st/topology/window/data/TimeData.java |    13 +-
 .../st/topology/window/data/TimeDataWindow.java |    82 +-
 .../apache/storm/st/utils/StringDecorator.java  |     5 +
 .../st/tests/window/SlidingWindowTest.java      |    91 +-
 .../st/tests/window/TumblingWindowTest.java     |     7 +-
 .../storm/st/tests/window/WindowVerifier.java   |   137 +
 .../storm/st/wrapper/DecoratedLogLine.java      |    67 +
 .../org/apache/storm/st/wrapper/LogData.java    |    66 -
 .../apache/storm/st/wrapper/StormCluster.java   |    17 +-
 .../org/apache/storm/st/wrapper/TopoWrap.java   |   266 +-
 pom.xml                                         |   299 +-
 shaded-deps/pom.xml                             |   296 +
 sql/README.md                                   |   183 +-
 sql/storm-sql-core/pom.xml                      |    38 +-
 .../storm/sql/AbstractStreamsProcessor.java     |    67 +
 .../storm/sql/AbstractTridentProcessor.java     |    56 -
 .../src/jvm/org/apache/storm/sql/StormSql.java  |    50 +-
 .../org/apache/storm/sql/StormSqlContext.java   |    37 +-
 .../jvm/org/apache/storm/sql/StormSqlImpl.java  |   180 +-
 .../org/apache/storm/sql/StormSqlRunner.java    |    35 +-
 .../sql/calcite/ParallelStreamableTable.java    |    20 +-
 .../apache/storm/sql/calcite/ParallelTable.java |    28 +
 .../storm/sql/calcite/StormStreamableTable.java |    26 +
 .../apache/storm/sql/calcite/StormTable.java    |    26 +
 .../apache/storm/sql/compiler/CompilerUtil.java |   307 +-
 .../sql/compiler/RexNodeToJavaCodeCompiler.java |   299 +-
 .../sql/compiler/StormSqlTypeFactoryImpl.java   |    23 +-
 .../storm/sql/javac/CompilingClassLoader.java   |   305 +-
 .../storm/sql/parser/ColumnConstraint.java      |    46 +-
 .../storm/sql/parser/ColumnDefinition.java      |    48 +-
 .../storm/sql/parser/SqlCreateFunction.java     |    32 +-
 .../apache/storm/sql/parser/SqlCreateTable.java |   264 +-
 .../apache/storm/sql/parser/SqlDDLKeywords.java |    27 -
 .../apache/storm/sql/parser/SqlDdlKeywords.java |    22 +
 .../apache/storm/sql/parser/StormParser.java    |    59 +-
 .../apache/storm/sql/parser/UnparseUtil.java    |    75 +-
 .../sql/planner/StormRelDataTypeSystem.java     |    18 +-
 .../apache/storm/sql/planner/StormRelUtils.java |    36 +-
 .../planner/UnsupportedOperatorsVisitor.java    |    19 +-
 .../storm/sql/planner/rel/StormCalcRelBase.java |    18 +-
 .../sql/planner/rel/StormFilterRelBase.java     |    18 +-
 .../storm/sql/planner/rel/StormJoinRelBase.java |    24 +-
 .../sql/planner/rel/StormProjectRelBase.java    |    24 +-
 .../storm/sql/planner/rel/StormRelNode.java     |    18 +-
 .../planner/rel/StormStreamInsertRelBase.java   |    25 +-
 .../sql/planner/rel/StormStreamScanRelBase.java |    20 +-
 .../storm/sql/planner/streams/QueryPlanner.java |   158 +
 .../sql/planner/streams/StreamsPlanCreator.java |   126 +
 .../planner/streams/StreamsStormRuleSets.java   |   110 +
 .../sql/planner/streams/rel/StreamsCalcRel.java |    96 +
 .../planner/streams/rel/StreamsFilterRel.java   |    66 +
 .../streams/rel/StreamsLogicalConvention.java   |    69 +
 .../planner/streams/rel/StreamsProjectRel.java  |    69 +
 .../sql/planner/streams/rel/StreamsRel.java     |    27 +
 .../streams/rel/StreamsStreamInsertRel.java     |    81 +
 .../streams/rel/StreamsStreamScanRel.java       |    58 +
 .../streams/rules/StreamsAggregateRule.java     |    40 +
 .../planner/streams/rules/StreamsCalcRule.java  |    46 +
 .../streams/rules/StreamsFilterRule.java        |    47 +
 .../planner/streams/rules/StreamsJoinRule.java  |    39 +
 .../streams/rules/StreamsModifyRule.java        |    89 +
 .../streams/rules/StreamsProjectRule.java       |    48 +
 .../planner/streams/rules/StreamsScanRule.java  |    61 +
 .../storm/sql/planner/trident/QueryPlanner.java |   156 -
 .../sql/planner/trident/TridentPlanCreator.java |   123 -
 .../planner/trident/TridentStormRuleSets.java   |   110 -
 .../sql/planner/trident/rel/TridentCalcRel.java |    97 -
 .../planner/trident/rel/TridentFilterRel.java   |    65 -
 .../trident/rel/TridentLogicalConvention.java   |    67 -
 .../planner/trident/rel/TridentProjectRel.java  |    69 -
 .../sql/planner/trident/rel/TridentRel.java     |    25 -
 .../trident/rel/TridentStreamInsertRel.java     |    76 -
 .../trident/rel/TridentStreamScanRel.java       |    55 -
 .../trident/rules/TridentAggregateRule.java     |    39 -
 .../planner/trident/rules/TridentCalcRule.java  |    45 -
 .../trident/rules/TridentFilterRule.java        |    45 -
 .../planner/trident/rules/TridentJoinRule.java  |    37 -
 .../trident/rules/TridentModifyRule.java        |    71 -
 .../trident/rules/TridentProjectRule.java       |    45 -
 .../planner/trident/rules/TridentScanRule.java  |    58 -
 .../test/org/apache/storm/sql/SqlTestUtil.java  |    22 +-
 .../storm/sql/StormSqlLocalClusterImpl.java     |    25 +-
 .../test/org/apache/storm/sql/TestStormSql.java |   225 +-
 .../backends/streams/TestCompilerUtils.java     |   217 +
 .../backends/streams/TestPlanCompiler.java      |   235 +
 .../backends/trident/TestCompilerUtils.java     |   208 -
 .../backends/trident/TestExpressions.java       |   359 -
 .../backends/trident/TestPlanCompiler.java      |   229 -
 .../apache/storm/sql/parser/TestSqlParser.java  |    66 +-
 sql/storm-sql-external/storm-sql-hdfs/pom.xml   |     5 -
 .../storm/sql/hdfs/HdfsDataSourcesProvider.java |    75 +-
 .../sql/hdfs/TestHdfsDataSourcesProvider.java   |    59 +-
 sql/storm-sql-external/storm-sql-kafka/pom.xml  |    12 +-
 .../sql/kafka/KafkaDataSourcesProvider.java     |   121 +-
 .../kafka/RecordTranslatorSchemeAdapter.java    |    48 +
 .../sql/kafka/TestKafkaDataSourcesProvider.java |    86 +-
 .../storm-sql-mongodb/pom.xml                   |     5 -
 .../sql/mongodb/MongoDataSourcesProvider.java   |    64 +-
 .../mongodb/TestMongoDataSourcesProvider.java   |    94 +-
 sql/storm-sql-external/storm-sql-redis/pom.xml  |     5 -
 .../sql/redis/RedisDataSourcesProvider.java     |    98 +-
 .../sql/redis/TestRedisDataSourcesProvider.java |   108 +-
 sql/storm-sql-runtime/pom.xml                   |    37 +-
 .../storm/sql/runtime/DataSourcesProvider.java  |    13 +-
 .../storm/sql/runtime/DataSourcesRegistry.java  |     8 +-
 .../sql/runtime/ISqlStreamsDataSource.java      |    40 +
 .../sql/runtime/ISqlTridentDataSource.java      |    67 -
 .../sql/runtime/SimpleSqlTridentConsumer.java   |    42 -
 .../socket/SocketDataSourcesProvider.java       |    35 +-
 .../datasource/socket/bolt/SocketBolt.java      |   105 +
 .../datasource/socket/spout/SocketSpout.java    |   194 +
 .../datasource/socket/trident/SocketState.java  |    89 -
 .../socket/trident/SocketStateUpdater.java      |    59 -
 .../socket/trident/TridentSocketSpout.java      |   184 -
 .../streams/functions/EvaluationCalc.java       |    85 +
 .../streams/functions/EvaluationFilter.java     |    61 +
 .../streams/functions/EvaluationFunction.java   |    64 +
 .../StreamInsertMapToPairFunction.java          |    38 +
 .../functions/StreamsScanTupleValueMapper.java  |    51 +
 .../trident/functions/EvaluationCalc.java       |    95 -
 .../trident/functions/EvaluationFilter.java     |    67 -
 .../trident/functions/EvaluationFunction.java   |    74 -
 .../trident/functions/ForwardFunction.java      |    31 -
 .../test/org/apache/storm/sql/TestUtils.java    |   558 +-
 .../socket/TestSocketDataSourceProvider.java    |    94 -
 .../maven-shade-clojure-transformer/pom.xml     |     2 +-
 .../maven/shade/clojure/ClojureTransformer.java |    14 +-
 storm-buildtools/storm-maven-plugins/pom.xml    |     7 +-
 .../storm/maven/plugin/util/CommandExec.java    |   118 +-
 .../plugin/versioninfo/VersionInfoMojo.java     |   457 +-
 storm-client/pom.xml                            |   124 +-
 storm-client/src/genthrift.sh                   |     4 +-
 .../src/jvm/org/apache/storm/Config.java        |  1282 +-
 .../src/jvm/org/apache/storm/Constants.java     |    21 +-
 .../org/apache/storm/ICredentialsListener.java  |    21 +-
 .../src/jvm/org/apache/storm/ILocalCluster.java |   123 +-
 .../src/jvm/org/apache/storm/ILocalDRPC.java    |    21 +-
 .../jvm/org/apache/storm/ISubmitterHook.java    |    26 +-
 .../src/jvm/org/apache/storm/LogWriter.java     |    68 +-
 .../jvm/org/apache/storm/StormSubmitter.java    |   330 +-
 .../src/jvm/org/apache/storm/StormTimer.java    |   243 +-
 .../src/jvm/org/apache/storm/Thrift.java        |   127 +-
 .../storm/annotation/InterfaceStability.java    |    43 +-
 .../assignments/ILocalAssignmentsBackend.java   |    36 +-
 .../assignments/InMemoryAssignmentBackend.java  |    38 +-
 .../LocalAssignmentsBackendFactory.java         |    29 +-
 .../storm/blobstore/AtomicOutputStream.java     |    24 +-
 .../org/apache/storm/blobstore/BlobStore.java   |   326 +-
 .../storm/blobstore/BlobStoreAclHandler.java    |   142 +-
 .../apache/storm/blobstore/BlobStoreFile.java   |    38 +-
 .../apache/storm/blobstore/ClientBlobStore.java |   104 +-
 .../storm/blobstore/InputStreamWithMeta.java    |    20 +-
 .../org/apache/storm/blobstore/KeyFilter.java   |    19 +-
 .../blobstore/LocalModeClientBlobStore.java     |    31 +-
 .../apache/storm/blobstore/NimbusBlobStore.java |   412 +-
 .../src/jvm/org/apache/storm/bolt/JoinBolt.java |   534 +-
 .../storm/callback/DefaultWatcherCallBack.java  |    21 +-
 .../apache/storm/callback/WatcherCallBack.java  |    23 +-
 .../storm/callback/ZKStateChangedCallback.java  |    20 +-
 .../storm/cluster/ClusterStateContext.java      |    28 +-
 .../storm/cluster/ClusterStateListener.java     |    19 +-
 .../org/apache/storm/cluster/ClusterUtils.java  |   150 +-
 .../apache/storm/cluster/ConnectionState.java   |    19 +-
 .../org/apache/storm/cluster/DaemonType.java    |    44 +-
 .../org/apache/storm/cluster/ExecutorBeat.java  |    19 +-
 .../org/apache/storm/cluster/IStateStorage.java |   159 +-
 .../storm/cluster/IStormClusterState.java       |   139 +-
 .../storm/cluster/PaceMakerStateStorage.java    |    55 +-
 .../storm/cluster/StateStorageFactory.java      |    18 +-
 .../storm/cluster/StormClusterStateImpl.java    |   213 +-
 .../org/apache/storm/cluster/VersionedData.java |    25 +-
 .../apache/storm/cluster/ZKStateStorage.java    |    89 +-
 .../storm/cluster/ZKStateStorageFactory.java    |     3 -
 .../storm/container/cgroup/CgroupCenter.java    |    30 +-
 .../storm/container/cgroup/CgroupCommon.java    |    80 +-
 .../container/cgroup/CgroupCommonOperation.java |    39 +-
 .../container/cgroup/CgroupCoreFactory.java     |    66 +-
 .../storm/container/cgroup/CgroupOperation.java |    23 +-
 .../storm/container/cgroup/CgroupUtils.java     |    28 +-
 .../apache/storm/container/cgroup/Device.java   |    19 +-
 .../storm/container/cgroup/Hierarchy.java       |    19 +-
 .../storm/container/cgroup/SubSystem.java       |    25 +-
 .../storm/container/cgroup/SubSystemType.java   |    19 +-
 .../storm/container/cgroup/SystemOperation.java |    41 +-
 .../storm/container/cgroup/core/BlkioCore.java  |    34 +-
 .../storm/container/cgroup/core/CgroupCore.java |    19 +-
 .../storm/container/cgroup/core/CpuCore.java    |    48 +-
 .../container/cgroup/core/CpuacctCore.java      |    24 +-
 .../storm/container/cgroup/core/CpusetCore.java |   160 +-
 .../container/cgroup/core/DevicesCore.java      |   117 +-
 .../container/cgroup/core/FreezerCore.java      |    39 +-
 .../storm/container/cgroup/core/MemoryCore.java |   168 +-
 .../storm/container/cgroup/core/NetClsCore.java |    24 +-
 .../container/cgroup/core/NetPrioCore.java      |    24 +-
 .../storm/coordination/BatchBoltExecutor.java   |    50 +-
 .../coordination/BatchOutputCollector.java      |    12 +-
 .../coordination/BatchOutputCollectorImpl.java  |    29 +-
 .../coordination/BatchSubtopologyBuilder.java   |   165 +-
 .../storm/coordination/CoordinatedBolt.java     |   475 +-
 .../apache/storm/coordination/IBatchBolt.java   |    25 +-
 .../src/jvm/org/apache/storm/daemon/Acker.java  |    62 +-
 .../org/apache/storm/daemon/DaemonCommon.java   |    19 +-
 .../org/apache/storm/daemon/GrouperFactory.java |    92 +-
 .../org/apache/storm/daemon/Shutdownable.java   |    19 +-
 .../org/apache/storm/daemon/StormCommon.java    |   279 +-
 .../src/jvm/org/apache/storm/daemon/Task.java   |    70 +-
 .../daemon/metrics/BuiltinBoltMetrics.java      |    19 +-
 .../storm/daemon/metrics/BuiltinMetrics.java    |    19 +-
 .../daemon/metrics/BuiltinMetricsUtil.java      |    31 +-
 .../daemon/metrics/BuiltinSpoutMetrics.java     |    19 +-
 .../daemon/metrics/ClientMetricsUtils.java      |    18 +-
 .../daemon/metrics/ErrorReportingMetrics.java   |    18 +-
 .../daemon/metrics/SpoutThrottlingMetrics.java  |    18 +-
 .../storm/daemon/supervisor/AdvancedFSOps.java  |   260 +-
 .../supervisor/ClientSupervisorUtils.java       |    85 +-
 .../daemon/supervisor/ExitCodeCallback.java     |    24 +-
 .../storm/daemon/supervisor/IAdvancedFSOps.java |    56 +-
 .../daemon/worker/BackPressureTracker.java      |    74 +-
 .../storm/daemon/worker/LogConfigManager.java   |    17 +-
 .../org/apache/storm/daemon/worker/Worker.java  |   217 +-
 .../apache/storm/daemon/worker/WorkerState.java |   431 +-
 .../storm/daemon/worker/WorkerTransfer.java     |    11 +-
 .../dependency/DependencyBlobStoreUtils.java    |     8 +-
 .../dependency/DependencyPropertiesParser.java  |    34 +-
 .../storm/dependency/DependencyUploader.java    |    34 +-
 .../dependency/FileNotAvailableException.java   |    18 +-
 .../storm/drpc/DRPCInvocationsClient.java       |    52 +-
 .../jvm/org/apache/storm/drpc/DRPCSpout.java    |   152 +-
 .../jvm/org/apache/storm/drpc/JoinResult.java   |    37 +-
 .../org/apache/storm/drpc/KeyedFairBolt.java    |    35 +-
 .../storm/drpc/LinearDRPCInputDeclarer.java     |    32 +-
 .../storm/drpc/LinearDRPCTopologyBuilder.java   |   133 +-
 .../org/apache/storm/drpc/PrepareRequest.java   |    24 +-
 .../org/apache/storm/drpc/ReturnResults.java    |    61 +-
 .../jvm/org/apache/storm/executor/Executor.java |   122 +-
 .../apache/storm/executor/ExecutorShutdown.java |    35 +-
 .../apache/storm/executor/ExecutorTransfer.java |    49 +-
 .../apache/storm/executor/IRunningExecutor.java |    21 +-
 .../apache/storm/executor/LocalExecutor.java    |    25 +-
 .../org/apache/storm/executor/TupleInfo.java    |    26 +-
 .../storm/executor/bolt/BoltExecutor.java       |    56 +-
 .../executor/bolt/BoltOutputCollectorImpl.java  |    38 +-
 .../storm/executor/error/IReportError.java      |    19 +-
 .../storm/executor/error/ReportError.java       |    33 +-
 .../storm/executor/error/ReportErrorAndDie.java |    23 +-
 .../storm/executor/spout/SpoutExecutor.java     |    52 +-
 .../spout/SpoutOutputCollectorImpl.java         |    39 +-
 .../apache/storm/generated/AccessControl.java   |   228 +-
 .../storm/generated/AccessControlType.java      |     8 +-
 .../storm/generated/AlreadyAliveException.java  |   176 +-
 .../org/apache/storm/generated/Assignment.java  |   556 +-
 .../storm/generated/AuthorizationException.java |   176 +-
 .../storm/generated/BeginDownloadResult.java    |   238 +-
 .../jvm/org/apache/storm/generated/Bolt.java    |   189 +-
 .../storm/generated/BoltAggregateStats.java     |   263 +-
 .../org/apache/storm/generated/BoltStats.java   |   650 +-
 .../apache/storm/generated/ClusterSummary.java  |   399 +-
 .../storm/generated/ClusterWorkerHeartbeat.java |   291 +-
 .../storm/generated/CommonAggregateStats.java   |   394 +-
 .../generated/ComponentAggregateStats.java      |   231 +-
 .../apache/storm/generated/ComponentCommon.java |   329 +-
 .../apache/storm/generated/ComponentObject.java |   185 +-
 .../storm/generated/ComponentPageInfo.java      |   789 +-
 .../apache/storm/generated/ComponentType.java   |     8 +-
 .../org/apache/storm/generated/Credentials.java |   319 +-
 .../storm/generated/DRPCExceptionType.java      |     8 +-
 .../storm/generated/DRPCExecutionException.java |   201 +-
 .../org/apache/storm/generated/DRPCRequest.java |   209 +-
 .../apache/storm/generated/DebugOptions.java    |   205 +-
 .../apache/storm/generated/DistributedRPC.java  |   548 +-
 .../generated/DistributedRPCInvocations.java    |  1646 +-
 .../org/apache/storm/generated/ErrorInfo.java   |   267 +-
 .../storm/generated/ExecutorAggregateStats.java |   189 +-
 .../apache/storm/generated/ExecutorInfo.java    |   201 +-
 .../storm/generated/ExecutorSpecificStats.java  |   145 +-
 .../apache/storm/generated/ExecutorStats.java   |   389 +-
 .../apache/storm/generated/ExecutorSummary.java |   315 +-
 .../apache/storm/generated/GetInfoOptions.java  |   168 +-
 .../apache/storm/generated/GlobalStreamId.java  |   209 +-
 .../org/apache/storm/generated/Grouping.java    |   295 +-
 .../generated/HBAuthorizationException.java     |   176 +-
 .../storm/generated/HBExecutionException.java   |   176 +-
 .../org/apache/storm/generated/HBMessage.java   |   218 +-
 .../apache/storm/generated/HBMessageData.java   |   255 +-
 .../jvm/org/apache/storm/generated/HBNodes.java |   206 +-
 .../jvm/org/apache/storm/generated/HBPulse.java |   229 +-
 .../org/apache/storm/generated/HBRecords.java   |   194 +-
 .../storm/generated/HBServerMessageType.java    |     8 +-
 .../storm/generated/IllegalStateException.java  |   380 +
 .../generated/InvalidTopologyException.java     |   176 +-
 .../org/apache/storm/generated/JavaObject.java  |   225 +-
 .../apache/storm/generated/JavaObjectArg.java   |   285 +-
 .../generated/KeyAlreadyExistsException.java    |   176 +-
 .../storm/generated/KeyNotFoundException.java   |   176 +-
 .../org/apache/storm/generated/KillOptions.java |   176 +-
 .../storm/generated/LSApprovedWorkers.java      |   204 +-
 .../generated/LSSupervisorAssignments.java      |   204 +-
 .../apache/storm/generated/LSSupervisorId.java  |   176 +-
 .../apache/storm/generated/LSTopoHistory.java   |   327 +-
 .../storm/generated/LSTopoHistoryList.java      |   192 +-
 .../storm/generated/LSWorkerHeartbeat.java      |   283 +-
 .../apache/storm/generated/ListBlobsResult.java |   237 +-
 .../apache/storm/generated/LocalAssignment.java |   308 +-
 .../apache/storm/generated/LocalStateData.java  |   210 +-
 .../org/apache/storm/generated/LogConfig.java   |   210 +-
 .../org/apache/storm/generated/LogLevel.java    |   286 +-
 .../apache/storm/generated/LogLevelAction.java  |     8 +-
 .../jvm/org/apache/storm/generated/Nimbus.java  | 25331 ++++++++--------
 .../apache/storm/generated/NimbusSummary.java   |   296 +-
 .../org/apache/storm/generated/NodeInfo.java    |   227 +-
 .../storm/generated/NotAliveException.java      |   176 +-
 .../org/apache/storm/generated/NullStruct.java  |   143 +-
 .../apache/storm/generated/NumErrorsChoice.java |     8 +-
 .../storm/generated/OwnerResourceSummary.java   |   713 +-
 .../storm/generated/PrivateWorkerKey.java       |   256 +-
 .../apache/storm/generated/ProfileAction.java   |     8 +-
 .../apache/storm/generated/ProfileRequest.java  |   222 +-
 .../storm/generated/ReadableBlobMeta.java       |   195 +-
 .../storm/generated/RebalanceOptions.java       |   427 +-
 .../storm/generated/SettableBlobMeta.java       |   225 +-
 .../apache/storm/generated/SharedMemory.java    |   267 +-
 .../apache/storm/generated/ShellComponent.java  |   209 +-
 .../storm/generated/SpecificAggregateStats.java |   145 +-
 .../storm/generated/SpoutAggregateStats.java    |   176 +-
 .../org/apache/storm/generated/SpoutSpec.java   |   189 +-
 .../org/apache/storm/generated/SpoutStats.java  |   434 +-
 .../apache/storm/generated/StateSpoutSpec.java  |   189 +-
 .../org/apache/storm/generated/StormBase.java   |   536 +-
 .../apache/storm/generated/StormTopology.java   |   735 +-
 .../org/apache/storm/generated/StreamInfo.java  |   233 +-
 .../apache/storm/generated/SubmitOptions.java   |   191 +-
 .../org/apache/storm/generated/Supervisor.java  |  1225 +-
 .../storm/generated/SupervisorAssignments.java  |   214 +-
 .../apache/storm/generated/SupervisorInfo.java  |   759 +-
 .../storm/generated/SupervisorPageInfo.java     |   237 +-
 .../storm/generated/SupervisorSummary.java      |   528 +-
 .../generated/SupervisorWorkerHeartbeat.java    |   254 +-
 .../generated/SupervisorWorkerHeartbeats.java   |   225 +-
 .../storm/generated/ThriftSerializedObject.java |   227 +-
 .../storm/generated/TopologyActionOptions.java  |   145 +-
 .../storm/generated/TopologyHistoryInfo.java    |   206 +-
 .../apache/storm/generated/TopologyInfo.java    |   802 +-
 .../storm/generated/TopologyInitialStatus.java  |     8 +-
 .../storm/generated/TopologyPageInfo.java       |  1215 +-
 .../apache/storm/generated/TopologyStats.java   |   444 +-
 .../apache/storm/generated/TopologyStatus.java  |     8 +-
 .../apache/storm/generated/TopologySummary.java |   721 +-
 .../storm/generated/WorkerMetricList.java       |   194 +-
 .../storm/generated/WorkerMetricPoint.java      |   333 +-
 .../apache/storm/generated/WorkerMetrics.java   |   261 +-
 .../apache/storm/generated/WorkerResources.java |   406 +-
 .../apache/storm/generated/WorkerSummary.java   |   644 +-
 .../org/apache/storm/generated/WorkerToken.java |   268 +-
 .../apache/storm/generated/WorkerTokenInfo.java |   267 +-
 .../storm/generated/WorkerTokenServiceType.java |     8 +-
 .../storm/grouping/CustomStreamGrouping.java    |    48 +-
 .../src/jvm/org/apache/storm/grouping/Load.java |    31 +-
 .../grouping/LoadAwareCustomStreamGrouping.java |    21 +-
 .../grouping/LoadAwareShuffleGrouping.java      |    91 +-
 .../org/apache/storm/grouping/LoadMapping.java  |    41 +-
 .../storm/grouping/PartialKeyGrouping.java      |    60 +-
 .../apache/storm/grouping/ShuffleGrouping.java  |    30 +-
 .../org/apache/storm/hooks/BaseTaskHook.java    |    23 +-
 .../org/apache/storm/hooks/BaseWorkerHook.java  |    29 +-
 .../jvm/org/apache/storm/hooks/ITaskHook.java   |    34 +-
 .../jvm/org/apache/storm/hooks/IWorkerHook.java |    30 +-
 .../storm/hooks/SubmitterHookException.java     |     1 +
 .../apache/storm/hooks/info/BoltAckInfo.java    |    21 +-
 .../storm/hooks/info/BoltExecuteInfo.java       |    21 +-
 .../apache/storm/hooks/info/BoltFailInfo.java   |    21 +-
 .../org/apache/storm/hooks/info/EmitInfo.java   |    26 +-
 .../apache/storm/hooks/info/SpoutAckInfo.java   |    21 +-
 .../apache/storm/hooks/info/SpoutFailInfo.java  |    21 +-
 .../storm/lambda/LambdaBiConsumerBolt.java      |    23 +-
 .../apache/storm/lambda/LambdaConsumerBolt.java |    19 +-
 .../org/apache/storm/lambda/LambdaSpout.java    |    22 +-
 .../storm/lambda/SerializableBiConsumer.java    |    22 +-
 .../storm/lambda/SerializableCallable.java      |    18 +-
 .../storm/lambda/SerializableConsumer.java      |    22 +-
 .../storm/lambda/SerializableSupplier.java      |    22 +-
 .../storm/messaging/ConnectionWithStatus.java   |    59 +-
 .../DeserializingConnectionCallback.java        |    41 +-
 .../org/apache/storm/messaging/IConnection.java |    44 +-
 .../storm/messaging/IConnectionCallback.java    |    20 +-
 .../org/apache/storm/messaging/IContext.java    |    48 +-
 .../org/apache/storm/messaging/TaskMessage.java |    37 +-
 .../storm/messaging/TransportFactory.java       |    37 +-
 .../apache/storm/messaging/local/Context.java   |   145 +-
 .../messaging/netty/BackPressureStatus.java     |    36 +-
 .../netty/BackPressureStatusEncoder.java        |    37 +
 .../apache/storm/messaging/netty/Client.java    |   286 +-
 .../apache/storm/messaging/netty/Context.java   |    96 +-
 .../storm/messaging/netty/ControlMessage.java   |    77 +-
 .../messaging/netty/INettySerializable.java     |    29 +-
 .../storm/messaging/netty/ISaslClient.java      |    27 +-
 .../storm/messaging/netty/ISaslServer.java      |    23 +-
 .../apache/storm/messaging/netty/IServer.java   |    25 +-
 .../netty/KerberosSaslClientHandler.java        |   202 +-
 .../netty/KerberosSaslNettyClient.java          |   106 +-
 .../netty/KerberosSaslNettyClientState.java     |    28 +-
 .../netty/KerberosSaslNettyServer.java          |   139 +-
 .../netty/KerberosSaslNettyServerState.java     |    28 +-
 .../netty/KerberosSaslServerHandler.java        |    89 +-
 .../org/apache/storm/messaging/netty/Login.java |   141 +-
 .../storm/messaging/netty/MessageBatch.java     |    90 +-
 .../storm/messaging/netty/MessageBuffer.java    |    27 +-
 .../storm/messaging/netty/MessageDecoder.java   |   106 +-
 .../storm/messaging/netty/MessageEncoder.java   |    55 -
 .../netty/NettyRenameThreadFactory.java         |    45 +-
 .../netty/NettySerializableMessageEncoder.java  |    37 +
 .../netty/NettyUncaughtExceptionHandler.java    |    20 +-
 .../storm/messaging/netty/SaslMessageToken.java |   101 +-
 .../storm/messaging/netty/SaslNettyClient.java  |    68 +-
 .../messaging/netty/SaslNettyClientState.java   |    28 +-
 .../storm/messaging/netty/SaslNettyServer.java  |    73 +-
 .../messaging/netty/SaslNettyServerState.java   |    28 +-
 .../messaging/netty/SaslStormClientHandler.java |   153 +-
 .../netty/SaslStormServerAuthorizeHandler.java  |   111 +-
 .../messaging/netty/SaslStormServerHandler.java |   110 +-
 .../apache/storm/messaging/netty/SaslUtils.java |    43 +-
 .../apache/storm/messaging/netty/Server.java    |   224 +-
 .../messaging/netty/StormClientHandler.java     |   103 +-
 .../netty/StormClientPipelineFactory.java       |    51 +-
 .../messaging/netty/StormServerHandler.java     |    91 +-
 .../netty/StormServerPipelineFactory.java       |    59 +-
 .../apache/storm/metric/EventLoggerBolt.java    |    33 +-
 .../storm/metric/FileBasedEventLogger.java      |     9 +-
 .../org/apache/storm/metric/IEventLogger.java   |    51 +-
 .../storm/metric/LoggingMetricsConsumer.java    |    57 +-
 .../storm/metric/MetricsConsumerBolt.java       |    54 +-
 .../jvm/org/apache/storm/metric/SystemBolt.java |   138 +-
 .../storm/metric/api/AssignableMetric.java      |    19 +-
 .../apache/storm/metric/api/CombinedMetric.java |    21 +-
 .../apache/storm/metric/api/CountMetric.java    |    21 +-
 .../org/apache/storm/metric/api/ICombiner.java  |    20 +-
 .../org/apache/storm/metric/api/IMetric.java    |    26 +-
 .../storm/metric/api/IMetricsConsumer.java      |    79 +-
 .../storm/metric/api/IMetricsRegistrant.java    |    18 +-
 .../org/apache/storm/metric/api/IReducer.java   |    21 +-
 .../storm/metric/api/IStatefulObject.java       |    19 +-
 .../apache/storm/metric/api/MeanReducer.java    |    14 +-
 .../storm/metric/api/MultiCountMetric.java      |    26 +-
 .../storm/metric/api/MultiReducedMetric.java    |    28 +-
 .../apache/storm/metric/api/ReducedMetric.java  |    19 +-
 .../apache/storm/metric/api/StateMetric.java    |    19 +-
 .../metric/api/rpc/AssignableShellMetric.java   |    19 +-
 .../metric/api/rpc/CombinedShellMetric.java     |    19 +-
 .../storm/metric/api/rpc/CountShellMetric.java  |    21 +-
 .../storm/metric/api/rpc/IShellMetric.java      |    19 +-
 .../metric/api/rpc/ReducedShellMetric.java      |    19 +-
 .../apache/storm/metric/cgroup/CGroupCpu.java   |    28 +-
 .../storm/metric/cgroup/CGroupCpuGuarantee.java |    24 +-
 .../storm/metric/cgroup/CGroupMemoryLimit.java  |    24 +-
 .../storm/metric/cgroup/CGroupMemoryUsage.java  |    20 +-
 .../storm/metric/cgroup/CGroupMetricsBase.java  |    38 +-
 .../storm/metric/filter/FilterByMetricName.java |    42 +-
 .../storm/metric/filter/MetricsFilter.java      |    24 +-
 .../metric/internal/CountStatAndMetric.java     |    67 +-
 .../metric/internal/LatencyStatAndMetric.java   |    62 +-
 .../storm/metric/internal/MetricStatTimer.java  |    19 +-
 .../internal/MultiCountStatAndMetric.java       |    43 +-
 .../internal/MultiLatencyStatAndMetric.java     |    44 +-
 .../storm/metric/internal/RateTracker.java      |    56 +-
 .../storm/metric/util/DataPointExpander.java    |    94 +-
 .../org/apache/storm/metrics2/JcMetrics.java    |    18 +-
 .../org/apache/storm/metrics2/SimpleGauge.java  |    18 +-
 .../storm/metrics2/StormMetricRegistry.java     |    38 +-
 .../org/apache/storm/metrics2/TaskMetrics.java  |    20 +-
 .../storm/metrics2/filters/RegexFilter.java     |    19 +-
 .../metrics2/filters/StormMetricsFilter.java    |    20 +-
 .../reporters/ConsoleStormReporter.java         |    18 +-
 .../metrics2/reporters/CsvStormReporter.java    |    66 +-
 .../reporters/GangliaStormReporter.java         |   132 -
 .../reporters/GraphiteStormReporter.java        |    53 +-
 .../metrics2/reporters/JmxStormReporter.java    |    30 +-
 .../reporters/ScheduledStormReporter.java       |    61 +-
 .../storm/metrics2/reporters/StormReporter.java |    19 +-
 .../jvm/org/apache/storm/multilang/BoltMsg.java |    31 +-
 .../org/apache/storm/multilang/ISerializer.java |    34 +-
 .../apache/storm/multilang/JsonSerializer.java  |    50 +-
 .../storm/multilang/NoOutputException.java      |    22 +-
 .../org/apache/storm/multilang/ShellMsg.java    |   106 +-
 .../org/apache/storm/multilang/SpoutMsg.java    |    31 +-
 .../AbstractDNSToSwitchMapping.java             |    52 +-
 .../networktopography/DNSToSwitchMapping.java   |    42 +-
 .../DefaultRackDNSToSwitchMapping.java          |    24 +-
 .../org/apache/storm/nimbus/ILeaderElector.java |    68 +
 .../jvm/org/apache/storm/nimbus/NimbusInfo.java |    65 +-
 .../apache/storm/pacemaker/PacemakerClient.java |   232 +-
 .../storm/pacemaker/PacemakerClientHandler.java |    74 +-
 .../storm/pacemaker/PacemakerClientPool.java    |    71 +-
 .../pacemaker/PacemakerConnectionException.java |    19 +-
 .../storm/pacemaker/codec/ThriftDecoder.java    |    60 +-
 .../storm/pacemaker/codec/ThriftEncoder.java    |    97 +-
 .../pacemaker/codec/ThriftNettyClientCodec.java |    80 +-
 .../org/apache/storm/policy/IWaitStrategy.java  |    19 +-
 .../apache/storm/policy/WaitStrategyPark.java   |    22 +-
 .../storm/policy/WaitStrategyProgressive.java   |    31 +-
 .../org/apache/storm/scheduler/WorkerSlot.java  |    37 +-
 .../storm/security/INimbusCredentialPlugin.java |    46 +-
 .../apache/storm/security/auth/AuthUtils.java   |   547 -
 .../org/apache/storm/security/auth/AutoSSL.java |   136 +-
 .../storm/security/auth/ClientAuthUtils.java    |   529 +
 .../auth/DefaultHttpCredentialsPlugin.java      |    96 -
 .../security/auth/DefaultPrincipalToLocal.java  |    30 +-
 .../storm/security/auth/FixedGroupsMapping.java |    25 +-
 .../apache/storm/security/auth/IAuthorizer.java |    42 +-
 .../storm/security/auth/IAutoCredentials.java   |    37 +-
 .../security/auth/ICredentialsRenewer.java      |    47 +-
 .../auth/IGroupMappingServiceProvider.java      |    26 +-
 .../security/auth/IHttpCredentialsPlugin.java   |    48 -
 .../storm/security/auth/IPrincipalToLocal.java  |    27 +-
 .../storm/security/auth/ITransportPlugin.java   |    51 +-
 .../security/auth/KerberosPrincipalToLocal.java |    32 +-
 .../storm/security/auth/NimbusPrincipal.java    |    26 +-
 .../apache/storm/security/auth/ReqContext.java  |   119 +-
 .../security/auth/ShellBasedGroupsMapping.java  |    50 +-
 .../security/auth/SimpleTransportPlugin.java    |   114 +-
 .../security/auth/SingleUserPrincipal.java      |    18 +-
 .../storm/security/auth/TBackoffConnect.java    |    33 +-
 .../storm/security/auth/ThriftClient.java       |    72 +-
 .../security/auth/ThriftConnectionType.java     |    46 +-
 .../storm/security/auth/ThriftServer.java       |    41 +-
 .../auth/authorizer/DRPCAuthorizerBase.java     |    38 +-
 .../authorizer/DRPCSimpleACLAuthorizer.java     |   109 +-
 .../auth/authorizer/DenyAuthorizer.java         |    30 +-
 .../authorizer/ImpersonationAuthorizer.java     |    80 +-
 .../auth/authorizer/NoopAuthorizer.java         |    30 +-
 .../auth/authorizer/SimpleACLAuthorizer.java    |   133 +-
 .../authorizer/SimpleWhitelistAuthorizer.java   |    36 +-
 .../SupervisorSimpleACLAuthorizer.java          |    47 +-
 .../auth/digest/DigestSaslTransportPlugin.java  |    58 +-
 .../auth/digest/JassPasswordProvider.java       |    36 +-
 .../storm/security/auth/kerberos/AutoTGT.java   |   176 +-
 .../auth/kerberos/AutoTGTKrb5LoginModule.java   |    31 +-
 .../kerberos/AutoTGTKrb5LoginModuleTest.java    |    20 +-
 .../auth/kerberos/ClientCallbackHandler.java    |    70 +-
 .../kerberos/KerberosSaslTransportPlugin.java   |   249 +-
 .../security/auth/kerberos/NoOpTTrasport.java   |    25 +-
 .../auth/kerberos/ServerCallbackHandler.java    |    51 +-
 .../auth/plain/PlainClientCallbackHandler.java  |    23 +-
 .../auth/plain/PlainSaslTransportPlugin.java    |    57 +-
 .../security/auth/plain/SaslPlainServer.java    |   249 +-
 .../security/auth/sasl/PasswordProvider.java    |    35 +-
 .../security/auth/sasl/SaslTransportPlugin.java |    59 +-
 .../sasl/SimpleSaslClientCallbackHandler.java   |    21 +-
 .../sasl/SimpleSaslServerCallbackHandler.java   |    40 +-
 .../auth/workertoken/WorkerTokenAuthorizer.java |   105 +-
 .../WorkerTokenClientCallbackHandler.java       |    54 +-
 .../auth/workertoken/WorkerTokenSigner.java     |     6 +-
 .../serialization/BlowfishTupleSerializer.java  |    71 +-
 .../storm/serialization/DefaultKryoFactory.java |    65 +-
 .../DefaultSerializationDelegate.java           |    58 -
 .../GzipBridgeSerializationDelegate.java        |    65 -
 .../GzipBridgeThriftSerializationDelegate.java  |    34 +-
 .../GzipSerializationDelegate.java              |    31 +-
 .../GzipThriftSerializationDelegate.java        |    12 +-
 .../storm/serialization/IKryoDecorator.java     |    20 +-
 .../storm/serialization/IKryoFactory.java       |    37 +-
 .../storm/serialization/ITupleDeserializer.java |    21 +-
 .../storm/serialization/ITupleSerializer.java   |    21 +-
 .../serialization/KryoTupleDeserializer.java    |    31 +-
 .../serialization/KryoTupleSerializer.java      |    47 +-
 .../serialization/KryoValuesDeserializer.java   |    36 +-
 .../serialization/KryoValuesSerializer.java     |    31 +-
 .../serialization/SerializableSerializer.java   |    25 +-
 .../serialization/SerializationDelegate.java    |    19 +-
 .../serialization/SerializationFactory.java     |   171 +-
 .../serialization/SerializationRegister.java    |     9 +-
 .../ThriftSerializationDelegate.java            |    32 +-
 .../types/ArrayListSerializer.java              |    21 +-
 .../serialization/types/HashMapSerializer.java  |    19 +-
 .../serialization/types/HashSetSerializer.java  |    21 +-
 .../types/ListDelegateSerializer.java           |    23 +-
 .../org/apache/storm/spout/CheckPointState.java |   117 +-
 .../org/apache/storm/spout/CheckpointSpout.java |    28 +-
 .../storm/spout/IMultiSchemableSpout.java       |    24 +-
 .../org/apache/storm/spout/ISchemableSpout.java |    24 +-
 .../src/jvm/org/apache/storm/spout/ISpout.java  |   105 +-
 .../storm/spout/ISpoutOutputCollector.java      |    35 +-
 .../jvm/org/apache/storm/spout/MultiScheme.java |    27 +-
 .../org/apache/storm/spout/RawMultiScheme.java  |    18 +-
 .../jvm/org/apache/storm/spout/RawScheme.java   |     8 +-
 .../src/jvm/org/apache/storm/spout/Scheme.java  |    24 +-
 .../apache/storm/spout/SchemeAsMultiScheme.java |    49 +-
 .../jvm/org/apache/storm/spout/ShellSpout.java  |    80 +-
 .../storm/spout/SpoutOutputCollector.java       |   102 +-
 .../storm/state/BaseBinaryStateIterator.java    |    27 +-
 .../apache/storm/state/BaseStateIterator.java   |    27 +-
 .../apache/storm/state/DefaultStateEncoder.java |    24 +-
 .../storm/state/DefaultStateSerializer.java     |    38 +-
 .../jvm/org/apache/storm/state/IStateSpout.java |    24 +-
 .../storm/state/IStateSpoutOutputCollector.java |    19 +-
 .../apache/storm/state/ISubscribedState.java    |    20 +-
 .../state/ISynchronizeOutputCollector.java      |    21 +-
 .../storm/state/InMemoryKeyValueState.java      |    71 +-
 .../state/InMemoryKeyValueStateProvider.java    |    22 +-
 .../org/apache/storm/state/KeyValueState.java   |    22 +-
 .../jvm/org/apache/storm/state/Serializer.java  |    22 +-
 .../src/jvm/org/apache/storm/state/State.java   |    29 +-
 .../org/apache/storm/state/StateEncoder.java    |    18 +-
 .../org/apache/storm/state/StateFactory.java    |    30 +-
 .../org/apache/storm/state/StateProvider.java   |    28 +-
 .../storm/state/StateSpoutOutputCollector.java  |    19 +-
 .../storm/state/SynchronizeOutputCollector.java |    19 +-
 .../apache/storm/stats/BoltExecutorStats.java   |    36 +-
 .../org/apache/storm/stats/ClientStatsUtil.java |   202 +
 .../jvm/org/apache/storm/stats/CommonStats.java |    25 +-
 .../apache/storm/stats/SpoutExecutorStats.java  |    24 +-
 .../jvm/org/apache/storm/stats/StatsUtil.java   |  2641 --
 .../src/jvm/org/apache/storm/streams/Edge.java  |    19 +-
 .../org/apache/storm/streams/GroupingInfo.java  |    38 +-
 .../src/jvm/org/apache/storm/streams/Node.java  |    78 +-
 .../src/jvm/org/apache/storm/streams/Pair.java  |    57 +-
 .../org/apache/storm/streams/PairStream.java    |   149 +-
 .../org/apache/storm/streams/PartitionNode.java |    24 +-
 .../org/apache/storm/streams/ProcessorBolt.java |    28 +-
 .../storm/streams/ProcessorBoltDelegate.java    |    74 +-
 .../org/apache/storm/streams/ProcessorNode.java |    44 +-
 .../apache/storm/streams/RefCountedTuple.java   |    30 +-
 .../jvm/org/apache/storm/streams/SinkNode.java  |    22 +-
 .../jvm/org/apache/storm/streams/SpoutNode.java |    21 +-
 .../storm/streams/StatefulProcessorBolt.java    |    34 +-
 .../jvm/org/apache/storm/streams/Stream.java    |   123 +-
 .../org/apache/storm/streams/StreamBolt.java    |    22 +-
 .../org/apache/storm/streams/StreamBuilder.java |    94 +-
 .../org/apache/storm/streams/StreamState.java   |    22 +-
 .../org/apache/storm/streams/StreamUtil.java    |    24 +-
 .../storm/streams/StreamsEdgeFactory.java       |    22 +-
 .../org/apache/storm/streams/UniqueIdGen.java   |    21 +-
 .../org/apache/storm/streams/WindowNode.java    |    21 +-
 .../storm/streams/WindowedProcessorBolt.java    |    30 +-
 .../storm/streams/operations/BiFunction.java    |    19 +-
 .../streams/operations/CombinerAggregator.java  |    85 +-
 .../storm/streams/operations/Consumer.java      |    19 +-
 .../streams/operations/FlatMapFunction.java     |    19 +-
 .../storm/streams/operations/Function.java      |    19 +-
 .../streams/operations/IdentityFunction.java    |    19 +-
 .../storm/streams/operations/Operation.java     |    19 +-
 .../streams/operations/PairFlatMapFunction.java |    19 +-
 .../storm/streams/operations/PairFunction.java  |    21 +-
 .../streams/operations/PairValueJoiner.java     |    19 +-
 .../storm/streams/operations/Predicate.java     |    19 +-
 .../storm/streams/operations/PrintConsumer.java |    19 +-
 .../storm/streams/operations/Reducer.java       |    22 +-
 .../storm/streams/operations/StateUpdater.java  |    54 +-
 .../storm/streams/operations/ValueJoiner.java   |    19 +-
 .../streams/operations/aggregators/Count.java   |    19 +-
 .../streams/operations/aggregators/LongSum.java |    19 +-
 .../operations/mappers/PairValueMapper.java     |    22 +-
 .../operations/mappers/TupleValueMapper.java    |    22 +-
 .../operations/mappers/TupleValueMappers.java   |   128 +-
 .../streams/operations/mappers/ValueMapper.java |    22 +-
 .../operations/mappers/ValuesMapper.java        |    25 +-
 .../processors/AggregateByKeyProcessor.java     |    33 +-
 .../streams/processors/AggregateProcessor.java  |    27 +-
 .../storm/streams/processors/BaseProcessor.java |    45 +-
 .../streams/processors/BatchProcessor.java      |    22 +-
 .../streams/processors/BranchProcessor.java     |    22 +-
 .../processors/ChainedProcessorContext.java     |    22 +-
 .../processors/CoGroupByKeyProcessor.java       |    27 +-
 .../processors/EmittingProcessorContext.java    |    37 +-
 .../streams/processors/FilterProcessor.java     |    19 +-
 .../streams/processors/FlatMapProcessor.java    |    19 +-
 .../processors/FlatMapValuesProcessor.java      |    19 +-
 .../streams/processors/ForEachProcessor.java    |    19 +-
 .../processors/ForwardingProcessorContext.java  |    27 +-
 .../storm/streams/processors/JoinProcessor.java |    40 +-
 .../storm/streams/processors/MapProcessor.java  |    19 +-
 .../streams/processors/MapValuesProcessor.java  |    19 +-
 .../MergeAggregateByKeyProcessor.java           |    24 +-
 .../processors/MergeAggregateProcessor.java     |    19 +-
 .../storm/streams/processors/PeekProcessor.java |    19 +-
 .../storm/streams/processors/Processor.java     |    29 +-
 .../streams/processors/ProcessorContext.java    |    28 +-
 .../processors/ReduceByKeyProcessor.java        |    24 +-
 .../streams/processors/ReduceProcessor.java     |    19 +-
 .../streams/processors/StateQueryProcessor.java |    19 +-
 .../streams/processors/StatefulProcessor.java   |    22 +-
 .../processors/UpdateStateByKeyProcessor.java   |    19 +-
 .../org/apache/storm/streams/tuple/Tuple10.java |    63 +-
 .../org/apache/storm/streams/tuple/Tuple3.java  |    35 +-
 .../org/apache/storm/streams/tuple/Tuple4.java  |    39 +-
 .../org/apache/storm/streams/tuple/Tuple5.java  |    43 +-
 .../org/apache/storm/streams/tuple/Tuple6.java  |    47 +-
 .../org/apache/storm/streams/tuple/Tuple7.java  |    51 +-
 .../org/apache/storm/streams/tuple/Tuple8.java  |    55 +-
 .../org/apache/storm/streams/tuple/Tuple9.java  |    59 +-
 .../storm/streams/windowing/BaseWindow.java     |    33 +-
 .../storm/streams/windowing/SlidingWindows.java |    84 +-
 .../streams/windowing/TumblingWindows.java      |    68 +-
 .../apache/storm/streams/windowing/Window.java  |    32 +-
 .../storm/task/GeneralTopologyContext.java      |    74 +-
 .../src/jvm/org/apache/storm/task/IBolt.java    |    86 +-
 .../org/apache/storm/task/IErrorReporter.java   |    19 +-
 .../org/apache/storm/task/IMetricsContext.java  |    23 +-
 .../org/apache/storm/task/IOutputCollector.java |    29 +-
 .../org/apache/storm/task/OutputCollector.java  |   164 +-
 .../jvm/org/apache/storm/task/ShellBolt.java    |    95 +-
 .../org/apache/storm/task/TopologyContext.java  |   192 +-
 .../storm/task/WorkerTopologyContext.java       |   110 +-
 .../apache/storm/testing/AckFailDelegate.java   |    20 +-
 .../apache/storm/testing/AckFailMapTracker.java |    39 +-
 .../org/apache/storm/testing/AckTracker.java    |    31 +-
 .../AlternateRackDNSToSwitchMapping.java        |    79 +-
 .../apache/storm/testing/BatchNumberList.java   |    72 -
 .../apache/storm/testing/BatchProcessWord.java  |    39 -
 .../org/apache/storm/testing/BatchRepeatA.java  |    48 -
 .../org/apache/storm/testing/BoltTracker.java   |    23 +-
 .../apache/storm/testing/CompletableSpout.java  |    21 +-
 .../apache/storm/testing/CountingBatchBolt.java |    55 -
 .../storm/testing/CountingCommitBolt.java       |    57 -
 .../org/apache/storm/testing/FeederSpout.java   |    40 +-
 .../org/apache/storm/testing/FixedTuple.java    |    22 +-
 .../apache/storm/testing/FixedTupleSpout.java   |   116 +-
 .../testing/ForwardingMetricsConsumer.java      |    61 +-
 .../org/apache/storm/testing/IdentityBolt.java  |    23 +-
 .../apache/storm/testing/IntegrationTest.java   |    14 +-
 .../storm/testing/KeyedCountingBatchBolt.java   |    62 -
 .../testing/KeyedCountingCommitterBolt.java     |    24 -
 .../storm/testing/KeyedSummingBatchBolt.java    |    60 -
 .../storm/testing/MemoryTransactionalSpout.java |   182 -
 .../testing/MemoryTransactionalSpoutMeta.java   |    38 -
 .../apache/storm/testing/MkClusterParam.java    |   112 +-
 .../org/apache/storm/testing/MkTupleParam.java  |    87 +-
 .../org/apache/storm/testing/MockedSources.java |    42 +-
 .../jvm/org/apache/storm/testing/NGrouping.java |    37 +-
 .../storm/testing/NonRichBoltTracker.java       |    23 +-
 .../testing/OpaqueMemoryTransactionalSpout.java |   188 -
 .../apache/storm/testing/PerformanceTest.java   |    37 +
 .../apache/storm/testing/PrepareBatchBolt.java  |    30 +-
 .../storm/testing/PythonShellMetricsBolt.java   |    30 +-
 .../storm/testing/PythonShellMetricsSpout.java  |    34 +-
 .../testing/SingleUserSimpleTransport.java      |    45 +-
 .../org/apache/storm/testing/SpoutTracker.java  |   100 +-
 .../storm/testing/TestAggregatesCounter.java    |    34 +-
 .../org/apache/storm/testing/TestConfBolt.java  |    31 +-
 .../apache/storm/testing/TestEventLogSpout.java |   114 +-
 .../storm/testing/TestEventOrderCheckBolt.java  |    35 +-
 .../apache/storm/testing/TestGlobalCount.java   |    30 +-
 .../apache/storm/testing/TestKryoDecorator.java |    24 +-
 .../apache/storm/testing/TestPlannerBolt.java   |    31 +-
 .../apache/storm/testing/TestPlannerSpout.java  |    56 +-
 .../org/apache/storm/testing/TestSerObject.java |    27 +-
 .../storm/testing/TestWordBytesCounter.java     |    21 +-
 .../apache/storm/testing/TestWordCounter.java   |    42 +-
 .../org/apache/storm/testing/TestWordSpout.java |    48 +-
 .../jvm/org/apache/storm/testing/TmpPath.java   |    48 +-
 .../apache/storm/testing/TupleCaptureBolt.java  |    37 +-
 .../topology/BaseConfigurationDeclarer.java     |    40 +-
 .../topology/BaseStatefulBoltExecutor.java      |    57 +-
 .../storm/topology/BasicBoltExecutor.java       |    31 +-
 .../storm/topology/BasicOutputCollector.java    |    33 +-
 .../org/apache/storm/topology/BoltDeclarer.java |    22 +-
 .../topology/CheckpointTupleForwarder.java      |    49 +-
 .../ComponentConfigurationDeclarer.java         |    26 +-
 .../storm/topology/ConfigurableTopology.java    |    99 +-
 .../apache/storm/topology/FailedException.java  |    23 +-
 .../org/apache/storm/topology/IBasicBolt.java   |    25 +-
 .../storm/topology/IBasicOutputCollector.java   |    26 +-
 .../org/apache/storm/topology/IComponent.java   |    28 +-
 .../org/apache/storm/topology/IRichBolt.java    |    24 +-
 .../org/apache/storm/topology/IRichSpout.java   |    24 +-
 .../apache/storm/topology/IRichStateSpout.java  |    19 +-
 .../apache/storm/topology/IStatefulBolt.java    |    30 +-
 .../storm/topology/IStatefulComponent.java      |    34 +-
 .../storm/topology/IStatefulWindowedBolt.java   |    21 +-
 .../apache/storm/topology/IWindowedBolt.java    |    30 +-
 .../apache/storm/topology/InputDeclarer.java    |    77 +-
 .../storm/topology/OutputFieldsDeclarer.java    |    23 +-
 .../storm/topology/OutputFieldsGetter.java      |    25 +-
 .../PersistentWindowedBoltExecutor.java         |    38 +-
 .../storm/topology/ReportedFailedException.java |    23 +-
 .../apache/storm/topology/ResourceDeclarer.java |    37 +-
 .../storm/topology/SharedOffHeapWithinNode.java |    22 +-
 .../topology/SharedOffHeapWithinWorker.java     |    22 +-
 .../org/apache/storm/topology/SharedOnHeap.java |    22 +-
 .../apache/storm/topology/SpoutDeclarer.java    |    21 +-
 .../storm/topology/StatefulBoltExecutor.java    |    37 +-
 .../topology/StatefulWindowedBoltExecutor.java  |    80 +-
 .../apache/storm/topology/TopologyBuilder.java  |   381 +-
 .../topology/TupleFieldTimestampExtractor.java  |    31 +-
 .../storm/topology/WindowedBoltExecutor.java    |    75 +-
 .../storm/topology/base/BaseBasicBolt.java      |    23 +-
 .../storm/topology/base/BaseBatchBolt.java      |    21 +-
 .../storm/topology/base/BaseComponent.java      |    23 +-
 ...BaseOpaquePartitionedTransactionalSpout.java |    25 -
 .../base/BasePartitionedTransactionalSpout.java |    24 -
 .../storm/topology/base/BaseRichBolt.java       |    21 +-
 .../storm/topology/base/BaseRichSpout.java      |    19 +-
 .../storm/topology/base/BaseStatefulBolt.java   |    22 +-
 .../topology/base/BaseStatefulWindowedBolt.java |    31 +-
 .../base/BaseTickTupleAwareRichBolt.java        |     8 +-
 .../topology/base/BaseTransactionalBolt.java    |    24 -
 .../topology/base/BaseTransactionalSpout.java   |    24 -
 .../storm/topology/base/BaseWindowedBolt.java   |   325 +-
 .../apache/storm/transactional/ICommitter.java  |    26 -
 .../ICommitterTransactionalSpout.java           |    31 -
 .../transactional/ITransactionalSpout.java      |    94 -
 .../storm/transactional/TransactionAttempt.java |    41 +-
 .../TransactionalSpoutBatchExecutor.java        |    96 -
 .../TransactionalSpoutCoordinator.java          |   214 -
 .../TransactionalTopologyBuilder.java           |   567 -
 .../IOpaquePartitionedTransactionalSpout.java   |    56 -
 .../IPartitionedTransactionalSpout.java         |    69 -
 ...uePartitionedTransactionalSpoutExecutor.java |   160 -
 .../PartitionedTransactionalSpoutExecutor.java  |   142 -
 .../state/RotatingTransactionalState.java       |   149 -
 .../state/TestTransactionalState.java           |    47 -
 .../transactional/state/TransactionalState.java |   186 -
 .../apache/storm/trident/JoinOutFieldsMode.java |    29 +-
 .../jvm/org/apache/storm/trident/JoinType.java  |    21 +-
 .../jvm/org/apache/storm/trident/Stream.java    |   387 +-
 .../org/apache/storm/trident/TridentState.java  |    19 +-
 .../apache/storm/trident/TridentTopology.java   |  1471 +-
 .../trident/drpc/ReturnResultsReducer.java      |    81 +-
 .../fluent/ChainedAggregatorDeclarer.java       |   119 +-
 .../fluent/ChainedFullAggregatorDeclarer.java   |    26 +-
 .../ChainedPartitionAggregatorDeclarer.java     |    28 +-
 .../trident/fluent/GlobalAggregationScheme.java |    20 +-
 .../storm/trident/fluent/GroupedStream.java     |    79 +-
 .../trident/fluent/IAggregatableStream.java     |    25 +-
 .../fluent/IChainedAggregatorDeclarer.java      |    19 +-
 .../storm/trident/fluent/UniqueIdGen.java       |    21 +-
 .../storm/trident/graph/GraphGrouper.java       |    90 +-
 .../org/apache/storm/trident/graph/Group.java   |    99 +-
 .../storm/trident/operation/Aggregator.java     |    21 +-
 .../storm/trident/operation/Assembly.java       |    25 +-
 .../storm/trident/operation/BaseAggregator.java |    21 +-
 .../storm/trident/operation/BaseFilter.java     |    21 +-
 .../storm/trident/operation/BaseFunction.java   |    21 +-
 .../trident/operation/BaseMultiReducer.java     |    21 +-
 .../storm/trident/operation/BaseOperation.java  |    29 +-
 .../trident/operation/CombinerAggregator.java   |    21 +-
 .../storm/trident/operation/Consumer.java       |    25 +-
 .../operation/DefaultResourceDeclarer.java      |    34 +-
 .../storm/trident/operation/EachOperation.java  |    21 +-
 .../apache/storm/trident/operation/Filter.java  |    31 +-
 .../trident/operation/FlatMapFunction.java      |    23 +-
 .../storm/trident/operation/Function.java       |    86 +-
 .../trident/operation/GroupedMultiReducer.java  |    23 +-
 .../trident/operation/ITridentResource.java     |    26 +-
 .../storm/trident/operation/MapFunction.java    |    22 +-
 .../storm/trident/operation/MultiReducer.java   |    23 +-
 .../storm/trident/operation/Operation.java      |    35 +-
 .../OperationAwareFlatMapFunction.java          |    19 +-
 .../operation/OperationAwareMapFunction.java    |    19 +-
 .../trident/operation/ReducerAggregator.java    |    20 +-
 .../trident/operation/TridentCollector.java     |    33 +-
 .../operation/TridentMultiReducerContext.java   |    29 +-
 .../operation/TridentOperationContext.java      |    37 +-
 .../operation/builtin/ComparisonAggregator.java |    41 +-
 .../storm/trident/operation/builtin/Count.java  |    21 +-
 .../storm/trident/operation/builtin/Debug.java  |    27 +-
 .../storm/trident/operation/builtin/Equals.java |    27 +-
 .../trident/operation/builtin/FilterNull.java   |    26 +-
 .../storm/trident/operation/builtin/FirstN.java |    65 +-
 .../storm/trident/operation/builtin/MapGet.java |    27 +-
 .../storm/trident/operation/builtin/Max.java    |    25 +-
 .../operation/builtin/MaxWithComparator.java    |    31 +-
 .../storm/trident/operation/builtin/Min.java    |    25 +-
 .../operation/builtin/MinWithComparator.java    |    29 +-
 .../storm/trident/operation/builtin/Negate.java |    47 +-
 .../trident/operation/builtin/SnapshotGet.java  |    21 +-
 .../storm/trident/operation/builtin/Sum.java    |    40 +-
 .../operation/builtin/TupleCollectionGet.java   |    23 +-
 .../operation/impl/CaptureCollector.java        |    25 +-
 .../operation/impl/ChainedAggregatorImpl.java   |    72 +-
 .../trident/operation/impl/ChainedResult.java   |    37 +-
 .../operation/impl/CombinerAggStateUpdater.java |    31 +-
 .../impl/CombinerAggregatorCombineImpl.java     |    41 +-
 .../impl/CombinerAggregatorInitImpl.java        |    27 +-
 .../operation/impl/ConsumerExecutor.java        |    19 +-
 .../trident/operation/impl/FilterExecutor.java  |    25 +-
 .../operation/impl/FlatMapFunctionExecutor.java |    22 +-
 .../operation/impl/GlobalBatchToPartition.java  |    21 +-
 .../trident/operation/impl/GroupCollector.java  |    27 +-
 .../operation/impl/GroupedAggregator.java       |    37 +-
 .../impl/GroupedMultiReducerExecutor.java       |    39 +-
 .../operation/impl/IdentityMultiReducer.java    |    21 +-
 .../impl/IndexHashBatchToPartition.java         |    21 +-
 .../storm/trident/operation/impl/JoinState.java |    24 +-
 .../operation/impl/JoinerMultiReducer.java      |    59 +-
 .../operation/impl/MapFunctionExecutor.java     |    23 +-
 ...PreservingFieldsOrderJoinerMultiReducer.java |    38 +-
 .../operation/impl/ReducerAggStateUpdater.java  |    29 +-
 .../operation/impl/ReducerAggregatorImpl.java   |    39 +-
 .../storm/trident/operation/impl/Result.java    |    21 +-
 .../operation/impl/SingleEmitAggregator.java    |    68 +-
 .../trident/operation/impl/TrueFilter.java      |    21 +-
 .../storm/trident/partition/GlobalGrouping.java |    27 +-
 .../trident/partition/IdentityGrouping.java     |    35 +-
 .../trident/partition/IndexHashGrouping.java    |    45 +-
 .../storm/trident/planner/BridgeReceiver.java   |    23 +-
 .../org/apache/storm/trident/planner/Node.java  |    31 +-
 .../storm/trident/planner/NodeStateInfo.java    |    21 +-
 .../storm/trident/planner/PartitionNode.java    |    27 +-
 .../storm/trident/planner/ProcessorContext.java |    21 +-
 .../storm/trident/planner/ProcessorNode.java    |    23 +-
 .../apache/storm/trident/planner/SpoutNode.java |    31 +-
 .../storm/trident/planner/SubtopologyBolt.java  |   119 +-
 .../storm/trident/planner/TridentProcessor.java |    30 +-
 .../storm/trident/planner/TupleReceiver.java    |    20 +-
 .../planner/processor/AggregateProcessor.java   |    31 +-
 .../planner/processor/AppendCollector.java      |    31 +-
 .../planner/processor/EachProcessor.java        |    33 +-
 .../planner/processor/FreshCollector.java       |    33 +-
 .../trident/planner/processor/MapProcessor.java |    30 +-
 .../processor/MultiReducerProcessor.java        |    36 +-
 .../processor/PartitionPersistProcessor.java    |    45 +-
 .../planner/processor/ProjectedProcessor.java   |    33 +-
 .../planner/processor/StateQueryProcessor.java  |    52 +-
 .../planner/processor/TridentContext.java       |    45 +-
 .../storm/trident/spout/BatchSpoutExecutor.java |    85 +-
 .../apache/storm/trident/spout/IBatchID.java    |    20 +-
 .../apache/storm/trident/spout/IBatchSpout.java |    29 +-
 .../trident/spout/ICommitterTridentSpout.java   |    29 +-
 .../spout/IOpaquePartitionedTridentSpout.java   |    95 +-
 .../trident/spout/IPartitionedTridentSpout.java |   101 +-
 .../storm/trident/spout/ISpoutPartition.java    |    19 +-
 .../storm/trident/spout/ITridentDataSource.java |     1 +
 .../storm/trident/spout/ITridentSpout.java      |   131 +-
 .../OpaquePartitionedTridentSpoutExecutor.java  |   164 +-
 .../spout/PartitionedTridentSpoutExecutor.java  |   151 +-
 .../trident/spout/RichSpoutBatchExecutor.java   |   196 +-
 .../storm/trident/spout/RichSpoutBatchId.java   |    29 +-
 .../spout/RichSpoutBatchIdSerializer.java       |    21 +-
 .../trident/spout/RichSpoutBatchTriggerer.java  |    85 +-
 .../trident/spout/TridentSpoutCoordinator.java  |    37 +-
 .../trident/spout/TridentSpoutExecutor.java     |    65 +-
 .../storm/trident/state/BaseQueryFunction.java  |    21 +-
 .../storm/trident/state/BaseStateUpdater.java   |    21 +-
 .../trident/state/CombinerValueUpdater.java     |    28 +-
 .../storm/trident/state/ITupleCollection.java   |    19 +-
 .../state/JSONNonTransactionalSerializer.java   |    26 +-
 .../trident/state/JSONOpaqueSerializer.java     |    25 +-
 .../state/JSONTransactionalSerializer.java      |    25 +-
 .../apache/storm/trident/state/OpaqueValue.java |    41 +-
 .../storm/trident/state/QueryFunction.java      |    20 +-
 .../storm/trident/state/ReadOnlyState.java      |    21 +-
 .../trident/state/ReducerValueUpdater.java      |    27 +-
 .../apache/storm/trident/state/Serializer.java  |    20 +-
 .../org/apache/storm/trident/state/State.java   |    41 +-
 .../storm/trident/state/StateFactory.java       |    21 +-
 .../apache/storm/trident/state/StateSpec.java   |    21 +-
 .../apache/storm/trident/state/StateType.java   |    19 +-
 .../storm/trident/state/StateUpdater.java       |    19 +-
 .../storm/trident/state/TransactionalValue.java |    30 +-
 .../storm/trident/state/ValueUpdater.java       |    19 +-
 .../trident/state/map/CachedBatchReadsMap.java  |    56 +-
 .../storm/trident/state/map/CachedMap.java      |    30 +-
 .../storm/trident/state/map/IBackingMap.java    |    24 +-
 .../state/map/MapCombinerAggStateUpdater.java   |    42 +-
 .../state/map/MapReducerAggStateUpdater.java    |    35 +-
 .../storm/trident/state/map/MapState.java       |    20 +-
 .../state/map/MicroBatchIBackingMap.java        |    51 +-
 .../trident/state/map/NonTransactionalMap.java  |    38 +-
 .../storm/trident/state/map/OpaqueMap.java      |    62 +-
 .../trident/state/map/ReadOnlyMapState.java     |    19 +-
 .../trident/state/map/RemovableMapState.java    |    19 +-
 .../trident/state/map/SnapshottableMap.java     |    21 +-
 .../trident/state/map/TransactionalMap.java     |    52 +-
 .../state/snapshot/ReadOnlySnapshottable.java   |    21 +-
 .../trident/state/snapshot/Snapshottable.java   |    20 +-
 .../trident/testing/CountAsAggregator.java      |    31 +-
 .../storm/trident/testing/FeederBatchSpout.java |   181 +-
 .../testing/FeederCommitterBatchSpout.java      |    86 +-
 .../storm/trident/testing/FixedBatchSpout.java  |    50 +-
 .../apache/storm/trident/testing/IFeeder.java   |    21 +-
 .../trident/testing/LRUMemoryMapState.java      |    46 +-
 .../storm/trident/testing/MemoryBackingMap.java |    26 +-
 .../storm/trident/testing/MemoryMapState.java   |    58 +-
 .../org/apache/storm/trident/testing/Split.java |    27 +-
 .../storm/trident/testing/StringLength.java     |    23 +-
 .../storm/trident/testing/TrueFilter.java       |    21 +-
 .../storm/trident/testing/TuplifyArgs.java      |    25 +-
 .../storm/trident/topology/BatchInfo.java       |    21 +-
 .../trident/topology/ITridentBatchBolt.java     |    27 +-
 .../topology/MasterBatchCoordinator.java        |   211 +-
 .../trident/topology/TransactionAttempt.java    |    39 +-
 .../trident/topology/TridentBoltExecutor.java   |   489 +-
 .../topology/TridentTopologyBuilder.java        |   360 +-
 .../state/RotatingTransactionalState.java       |   107 +-
 .../topology/state/TestTransactionalState.java  |    37 +-
 .../topology/state/TransactionalState.java      |   134 +-
 .../apache/storm/trident/tuple/ComboList.java   |    86 +-
 .../apache/storm/trident/tuple/ConsList.java    |    24 +-
 .../storm/trident/tuple/TridentTuple.java       |    24 +-
 .../storm/trident/tuple/TridentTupleView.java   |   359 +-
 .../storm/trident/tuple/ValuePointer.java       |    54 +-
 .../storm/trident/util/ErrorEdgeFactory.java    |    23 +-
 .../apache/storm/trident/util/IndexedEdge.java  |    23 +-
 .../org/apache/storm/trident/util/LRUMap.java   |    21 +-
 .../apache/storm/trident/util/TridentUtils.java |    84 +-
 .../windowing/AbstractTridentWindowManager.java |   121 +-
 .../windowing/ITridentWindowManager.java        |    33 +-
 .../windowing/InMemoryTridentWindowManager.java |    22 +-
 .../trident/windowing/InMemoryWindowsStore.java |    56 +-
 .../windowing/InMemoryWindowsStoreFactory.java  |    34 +-
 .../StoreBasedTridentWindowManager.java         |    59 +-
 .../trident/windowing/TridentBatchTuple.java    |    20 +-
 .../trident/windowing/WindowKryoSerializer.java |    28 +-
 .../windowing/WindowTridentProcessor.java       |   114 +-
 .../storm/trident/windowing/WindowsState.java   |    25 +-
 .../trident/windowing/WindowsStateFactory.java  |    24 +-
 .../trident/windowing/WindowsStateUpdater.java  |    37 +-
 .../storm/trident/windowing/WindowsStore.java   |    28 +-
 .../trident/windowing/WindowsStoreFactory.java  |    30 +-
 .../windowing/config/BaseWindowConfig.java      |    23 +-
 .../windowing/config/SlidingCountWindow.java    |    33 +-
 .../windowing/config/SlidingDurationWindow.java |    33 +-
 .../windowing/config/TumblingCountWindow.java   |    31 +-
 .../config/TumblingDurationWindow.java          |    28 +-
 .../trident/windowing/config/WindowConfig.java  |    25 +-
 .../windowing/strategy/BaseWindowStrategy.java  |    20 +-
 .../strategy/SlidingCountWindowStrategy.java    |    24 +-
 .../strategy/SlidingDurationWindowStrategy.java |    25 +-
 .../strategy/TumblingCountWindowStrategy.java   |    27 +-
 .../TumblingDurationWindowStrategy.java         |    25 +-
 .../windowing/strategy/WindowStrategy.java      |    24 +-
 .../org/apache/storm/tuple/AddressedTuple.java  |    33 +-
 .../src/jvm/org/apache/storm/tuple/Fields.java  |    72 +-
 .../src/jvm/org/apache/storm/tuple/ITuple.java  |   135 +-
 .../jvm/org/apache/storm/tuple/MessageId.java   |    55 +-
 .../src/jvm/org/apache/storm/tuple/Tuple.java   |    49 +-
 .../jvm/org/apache/storm/tuple/TupleImpl.java   |    67 +-
 .../src/jvm/org/apache/storm/tuple/Values.java  |    30 +-
 .../jvm/org/apache/storm/utils/BatchHelper.java |    21 +-
 .../storm/utils/BufferFileInputStream.java      |    25 +-
 .../apache/storm/utils/CRC32OutputStream.java   |    25 +-
 .../jvm/org/apache/storm/utils/ConfigUtils.java |   102 +-
 .../org/apache/storm/utils/CuratorUtils.java    |    84 +-
 .../jvm/org/apache/storm/utils/DRPCClient.java  |   117 +-
 .../storm/utils/DefaultShellLogHandler.java     |    44 +-
 .../utils/DisallowedStrategyException.java      |     6 +-
 .../storm/utils/ExtendedThreadPoolExecutor.java |    66 +-
 .../jvm/org/apache/storm/utils/IPredicate.java  |    26 +-
 .../org/apache/storm/utils/InprocMessaging.java |    42 +-
 .../src/jvm/org/apache/storm/utils/JCQueue.java |   477 +-
 .../storm/utils/KeyedRoundRobinQueue.java       |    29 +-
 .../org/apache/storm/utils/ListDelegate.java    |    37 +-
 .../jvm/org/apache/storm/utils/LocalState.java  |    78 +-
 .../jvm/org/apache/storm/utils/MutableInt.java  |    29 +-
 .../jvm/org/apache/storm/utils/MutableLong.java |    29 +-
 .../org/apache/storm/utils/MutableObject.java   |    33 +-
 .../org/apache/storm/utils/NimbusClient.java    |   233 +-
 .../utils/NimbusLeaderNotFoundException.java    |     8 +-
 .../org/apache/storm/utils/ObjectReader.java    |    10 +-
 .../org/apache/storm/utils/ReflectionUtils.java |    17 +-
 .../storm/utils/RegisteredGlobalState.java      |    50 +-
 .../jvm/org/apache/storm/utils/RotatingMap.java |    75 +-
 .../org/apache/storm/utils/ServiceRegistry.java |    37 +-
 .../storm/utils/ShellBoltMessageQueue.java      |    42 +-
 .../apache/storm/utils/ShellCommandRunner.java  |    39 +-
 .../storm/utils/ShellCommandRunnerImpl.java     |     2 +-
 .../org/apache/storm/utils/ShellLogHandler.java |    40 +-
 .../org/apache/storm/utils/ShellProcess.java    |    59 +-
 .../jvm/org/apache/storm/utils/ShellUtils.java  |   374 +-
 .../org/apache/storm/utils/SimpleVersion.java   |    44 +-
 .../StormBoundedExponentialBackoffRetry.java    |    55 +-
 .../apache/storm/utils/SupervisorClient.java    |    70 +-
 .../apache/storm/utils/ThriftTopologyUtils.java |    23 +-
 .../src/jvm/org/apache/storm/utils/Time.java    |   223 +-
 .../org/apache/storm/utils/TimeCacheMap.java    |    62 +-
 .../org/apache/storm/utils/TransferDrainer.java |    92 +-
 .../jvm/org/apache/storm/utils/TupleUtils.java  |    60 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |   655 +-
 .../jvm/org/apache/storm/utils/VersionInfo.java |   205 +-
 .../org/apache/storm/utils/VersionedStore.java  |    97 +-
 .../storm/utils/WindowedTimeThrottler.java      |    31 +-
 .../utils/WrappedAlreadyAliveException.java     |    35 +
 .../utils/WrappedAuthorizationException.java    |    35 +
 .../utils/WrappedDRPCExecutionException.java    |    35 +
 .../utils/WrappedHBExecutionException.java      |    35 +
 .../utils/WrappedIllegalStateException.java     |    32 +
 .../utils/WrappedInvalidTopologyException.java  |    35 +
 .../utils/WrappedKeyAlreadyExistsException.java |    35 +
 .../utils/WrappedKeyNotFoundException.java      |    37 +
 .../storm/utils/WrappedNotAliveException.java   |    35 +
 .../org/apache/storm/utils/WritableUtils.java   |   662 +-
 .../apache/storm/utils/ZookeeperAuthInfo.java   |    29 +-
 .../storm/utils/ZookeeperServerCnxnFactory.java |    84 -
 .../storm/validation/ConfigValidation.java      |   618 +-
 .../validation/ConfigValidationAnnotations.java |    88 +-
 .../storm/validation/ConfigValidationUtils.java |   120 +-
 .../org/apache/storm/validation/NotConf.java    |    21 +-
 .../org/apache/storm/validation/Validated.java  |    19 +-
 .../storm/windowing/CountEvictionPolicy.java    |    36 +-
 .../storm/windowing/CountTriggerPolicy.java     |    30 +-
 .../storm/windowing/DefaultEvictionContext.java |    21 +-
 .../jvm/org/apache/storm/windowing/Event.java   |    27 +-
 .../org/apache/storm/windowing/EventImpl.java   |    25 +-
 .../apache/storm/windowing/EvictionContext.java |    27 +-
 .../apache/storm/windowing/EvictionPolicy.java  |    90 +-
 .../storm/windowing/StatefulWindowManager.java  |    67 +-
 .../storm/windowing/TimeEvictionPolicy.java     |    46 +-
 .../storm/windowing/TimeTriggerPolicy.java      |    51 +-
 .../storm/windowing/TimestampExtractor.java     |    22 +-
 .../apache/storm/windowing/TriggerHandler.java  |    22 +-
 .../apache/storm/windowing/TriggerPolicy.java   |    25 +-
 .../org/apache/storm/windowing/TupleWindow.java |    19 +-
 .../apache/storm/windowing/TupleWindowImpl.java |    46 +-
 .../storm/windowing/TupleWindowIterImpl.java    |    20 +-
 .../apache/storm/windowing/WaterMarkEvent.java  |    22 +-
 .../windowing/WaterMarkEventGenerator.java      |    47 +-
 .../windowing/WatermarkCountEvictionPolicy.java |    31 +-
 .../windowing/WatermarkCountTriggerPolicy.java  |    33 +-
 .../windowing/WatermarkTimeEvictionPolicy.java  |    44 +-
 .../windowing/WatermarkTimeTriggerPolicy.java   |    47 +-
 .../jvm/org/apache/storm/windowing/Window.java  |    45 +-
 .../windowing/WindowLifecycleListener.java      |    39 +-
 .../apache/storm/windowing/WindowManager.java   |   110 +-
 .../persistence/SimpleWindowPartitionCache.java |    50 +-
 .../persistence/WindowPartitionCache.java       |    21 +-
 .../windowing/persistence/WindowState.java      |    41 +-
 .../apache/storm/zookeeper/ClientZookeeper.java |   122 +-
 .../apache/storm/zookeeper/ZkEventTypes.java    |    22 +-
 .../apache/storm/zookeeper/ZkKeeperStates.java  |    22 +-
 storm-client/src/py/storm/DistributedRPC-remote |   125 +-
 storm-client/src/py/storm/DistributedRPC.py     |   531 +-
 .../py/storm/DistributedRPCInvocations-remote   |   155 +-
 .../src/py/storm/DistributedRPCInvocations.py   |  1637 +-
 storm-client/src/py/storm/Nimbus-remote         |   619 +-
 storm-client/src/py/storm/Nimbus.py             | 21156 +++++++------
 storm-client/src/py/storm/Supervisor-remote     |   145 +-
 storm-client/src/py/storm/Supervisor.py         |  1266 +-
 storm-client/src/py/storm/constants.py          |     9 +-
 storm-client/src/py/storm/ttypes.py             | 26376 ++++++++---------
 storm-client/src/storm.thrift                   |    21 +-
 .../storm/PaceMakerStateStorageFactoryTest.java |   110 +-
 .../org/apache/storm/TestConfigValidate.java    |   229 +-
 .../LocalAssignmentsBackendTest.java            |    20 +-
 .../storm/blobstore/ClientBlobStoreTest.java    |   295 +-
 .../jvm/org/apache/storm/bolt/TestJoinBolt.java |   299 +-
 .../apache/storm/cluster/DaemonTypeTest.java    |    27 +-
 .../cluster/StormClusterStateImplTest.java      |    36 +-
 .../daemon/worker/BackPressureTrackerTest.java  |   119 +
 .../daemon/worker/LogConfigManagerTest.java     |   112 +-
 .../apache/storm/daemon/worker/WorkerTest.java  |    22 +-
 .../DependencyPropertiesParserTest.java         |    26 +-
 .../dependency/DependencyUploaderTest.java      |    33 +-
 .../storm/executor/error/ReportErrorTest.java   |    38 +-
 .../grouping/LoadAwareShuffleGroupingTest.java  |    93 +-
 .../storm/grouping/ShuffleGroupingTest.java     |    34 +-
 .../BalancedTargetSelectorTest.java             |    32 +-
 .../PartialKeyGroupingTest.java                 |    24 +-
 .../RandomTwoTaskAssignmentCreatorTest.java     |    21 +-
 .../DeserializingConnectionCallbackTest.java    |    33 +-
 .../metric/filter/FilterByMetricNameTest.java   |    33 +-
 .../metric/internal/CountStatAndMetricTest.java |    47 +-
 .../internal/LatencyStatAndMetricTest.java      |    39 +-
 .../storm/metric/internal/RateTrackerTest.java  |    30 +-
 .../metric/util/DataPointExpanderTest.java      |   174 +-
 .../storm/security/auth/AuthUtilsTest.java      |   237 -
 .../storm/security/auth/AuthUtilsTestMock.java  |    47 +-
 .../apache/storm/security/auth/AutoSSLTest.java |    83 +-
 .../security/auth/ClientAuthUtilsTest.java      |   224 +
 .../auth/DefaultHttpCredentialsPluginTest.java  |    90 -
 .../storm/security/auth/ReqContextTest.java     |    30 +-
 .../security/auth/SaslTransportPluginTest.java  |    19 +-
 .../auth/ShellBasedGroupsMappingTest.java       |    40 +-
 .../storm/security/auth/ThriftClientTest.java   |    31 +-
 .../authorizer/DRPCSimpleACLAuthorizerTest.java |   134 +-
 .../authorizer/SimpleACLAuthorizerTest.java     |   505 +-
 .../BlowfishTupleSerializerTest.java            |    51 +-
 .../GzipBridgeSerializationDelegateTest.java    |    82 -
 ...ipBridgeThriftSerializationDelegateTest.java |    28 +-
 .../serialization/SerializationFactoryTest.java |    23 +-
 .../ThriftBridgeSerializationDelegateTest.java  |    22 +-
 .../apache/storm/spout/CheckpointSpoutTest.java |    38 +-
 .../state/BaseBinaryStateIteratorTest.java      |   257 +-
 .../storm/state/DefaultStateSerializerTest.java |     8 +-
 .../storm/state/InMemoryKeyValueStateTest.java  |    50 +-
 .../apache/storm/streams/ProcessorBoltTest.java |    50 +-
 .../streams/StatefulProcessorBoltTest.java      |    36 +-
 .../apache/storm/streams/StreamBuilderTest.java |   133 +-
 .../streams/WindowedProcessorBoltTest.java      |    32 +-
 .../processors/CoGroupByKeyProcessorTest.java   |    49 +-
 .../streams/processors/JoinProcessorTest.java   |    51 +-
 .../PersistentWindowedBoltExecutorTest.java     |    70 +-
 .../SimpleWindowPartitionCacheTest.java         |    31 +-
 .../topology/StatefulBoltExecutorTest.java      |    36 +-
 .../StatefulWindowedBoltExecutorTest.java       |    30 +-
 .../storm/topology/TopologyBuilderTest.java     |    43 +-
 .../topology/WindowedBoltExecutorTest.java      |    84 +-
 .../storm/trident/TestTridentTopology.java      |    39 +-
 .../storm/trident/TridentWindowingTest.java     |    65 +-
 .../jvm/org/apache/storm/tuple/FieldsTest.java  |    35 +-
 .../org/apache/storm/utils/ConfigUtilsTest.java |    55 +-
 .../apache/storm/utils/CuratorUtilsTest.java    |    25 +-
 .../storm/utils/DefaultShellLogHandlerTest.java |    27 +-
 .../storm/utils/JCQueueBackpressureTest.java    |    75 +-
 .../jvm/org/apache/storm/utils/JCQueueTest.java |    85 +-
 .../apache/storm/utils/MockTupleHelpers.java    |    42 +-
 .../storm/utils/ShellBoltMessageQueueTest.java  |    28 +-
 .../org/apache/storm/utils/ShellUtilsTest.java  |    50 +-
 ...StormBoundedExponentialBackoffRetryTest.java |    43 +-
 .../storm/utils/ThriftTopologyUtilsTest.java    |    50 +-
 .../utils/ThrowableNestedCauseMatcher.java      |     9 +-
 .../jvm/org/apache/storm/utils/TimeTest.java    |    36 +-
 .../jvm/org/apache/storm/utils/UtilsTest.java   |    96 +-
 .../utils/ZookeeperServerCnxnFactoryTest.java   |    39 -
 .../windowing/WaterMarkEventGeneratorTest.java  |    33 +-
 .../storm/windowing/WindowManagerTest.java      |   154 +-
 .../windowing/persistence/WindowStateTest.java  |    47 +-
 .../src/clj/org/apache/storm/thrift.clj         |     2 +-
 storm-core/pom.xml                              |   255 +-
 .../apache/storm/command/shell_submission.clj   |    31 +-
 storm-core/src/clj/org/apache/storm/ui/core.clj |  1642 -
 .../src/clj/org/apache/storm/ui/helpers.clj     |    62 -
 .../jvm/org/apache/storm/command/Activate.java  |    32 +-
 .../org/apache/storm/command/AdminCommands.java |   201 +-
 .../apache/storm/command/BasicDrpcClient.java   |    32 +-
 .../jvm/org/apache/storm/command/Blobstore.java |    85 +-
 .../src/jvm/org/apache/storm/command/CLI.java   |   504 +-
 .../org/apache/storm/command/ConfigValue.java   |    26 +-
 .../org/apache/storm/command/Deactivate.java    |    32 +-
 .../org/apache/storm/command/DevZookeeper.java  |    25 +-
 .../jvm/org/apache/storm/command/GetErrors.java |    33 +-
 .../org/apache/storm/command/HealthCheck.java   |    20 +-
 .../org/apache/storm/command/Heartbeats.java    |    23 +-
 .../org/apache/storm/command/KillTopology.java  |    39 +-
 .../org/apache/storm/command/KillWorkers.java   |    28 +-
 .../apache/storm/command/ListTopologies.java    |    58 +-
 .../jvm/org/apache/storm/command/Monitor.java   |    31 +-
 .../jvm/org/apache/storm/command/Rebalance.java |    44 +-
 .../org/apache/storm/command/SetLogLevel.java   |    34 +-
 .../apache/storm/command/UploadCredentials.java |    97 +-
 .../org/apache/storm/planner/CompoundSpout.java |    21 +-
 .../org/apache/storm/planner/CompoundTask.java  |    21 +-
 .../org/apache/storm/planner/TaskBundle.java    |    25 +-
 .../storm/shade/org/apache/zookeeper/ZkCli.java |   156 +
 .../apache/storm/testing/MockLeaderElector.java |    23 +-
 .../staticmocking/MockedClientZookeeper.java    |     1 +
 .../testing/staticmocking/MockedCluster.java    |    20 +-
 .../staticmocking/MockedSupervisorUtils.java    |    18 +-
 .../testing/staticmocking/MockedZookeeper.java  |    18 +-
 .../apache/storm/ui/FilterConfiguration.java    |    63 -
 .../jvm/org/apache/storm/ui/IConfigurator.java  |    24 -
 .../storm/ui/InvalidRequestException.java       |    37 -
 .../src/jvm/org/apache/storm/ui/UIHelpers.java  |   301 -
 .../apache/storm/utils/ClojureTimerTask.java    |    25 +-
 .../src/jvm/org/apache/storm/utils/Monitor.java |   185 +-
 .../apache/storm/utils/TopologySpoutLag.java    |   132 +-
 .../src/native/worker-launcher/impl/main.c      |    23 +-
 .../worker-launcher/impl/worker-launcher.c      |    18 +-
 storm-core/src/ui/public/component.html         |   569 -
 .../src/ui/public/css/bootstrap-3.3.1.min.css   |     5 -
 .../src/ui/public/css/dataTables.bootstrap.css  |   319 -
 .../public/css/jquery.dataTables.1.10.4.min.css |     1 -
 .../src/ui/public/css/jsonFormatter.min.css     |     1 -
 storm-core/src/ui/public/css/style.css          |   263 -
 storm-core/src/ui/public/css/vis.min.css        |     1 -
 .../src/ui/public/deep_search_result.html       |   177 -
 storm-core/src/ui/public/favicon.ico            |   Bin 18280 -> 0 bytes
 storm-core/src/ui/public/flux.html              |   157 -
 .../src/ui/public/images/back_disabled.png      |   Bin 1361 -> 0 bytes
 .../src/ui/public/images/back_enabled.png       |   Bin 1379 -> 0 bytes
 .../src/ui/public/images/back_enabled_hover.png |   Bin 1375 -> 0 bytes
 storm-core/src/ui/public/images/bolt.png        |   Bin 6019 -> 0 bytes
 storm-core/src/ui/public/images/bug.png         |   Bin 4045 -> 0 bytes
 storm-core/src/ui/public/images/component.png   |   Bin 699 -> 0 bytes
 storm-core/src/ui/public/images/flux.png        |   Bin 5328 -> 0 bytes
 .../src/ui/public/images/forward_disabled.png   |   Bin 1363 -> 0 bytes
 .../src/ui/public/images/forward_enabled.png    |   Bin 1380 -> 0 bytes
 .../ui/public/images/forward_enabled_hover.png  |   Bin 1379 -> 0 bytes
 storm-core/src/ui/public/images/search.png      |   Bin 2354 -> 0 bytes
 storm-core/src/ui/public/images/sort_asc.png    |   Bin 1118 -> 0 bytes
 .../src/ui/public/images/sort_asc_disabled.png  |   Bin 2916 -> 0 bytes
 storm-core/src/ui/public/images/sort_both.png   |   Bin 1136 -> 0 bytes
 storm-core/src/ui/public/images/sort_desc.png   |   Bin 1127 -> 0 bytes
 .../src/ui/public/images/sort_desc_disabled.png |   Bin 1045 -> 0 bytes
 storm-core/src/ui/public/images/spinner.gif     |   Bin 23470 -> 0 bytes
 storm-core/src/ui/public/images/spout.png       |   Bin 5255 -> 0 bytes
 storm-core/src/ui/public/images/statistic.png   |   Bin 488 -> 0 bytes
 storm-core/src/ui/public/images/streams.png     |   Bin 903 -> 0 bytes
 storm-core/src/ui/public/index.html             |   208 -
 .../src/ui/public/js/bootstrap-3.3.1.min.js     |     7 -
 storm-core/src/ui/public/js/cytoscape-dagre.js  |   192 -
 storm-core/src/ui/public/js/cytoscape.min.js    |    63 -
 storm-core/src/ui/public/js/dagre.min.js        |     6 -
 .../ui/public/js/dataTables.bootstrap.min.js    |     8 -
 storm-core/src/ui/public/js/esprima.min.js      |     2 -
 .../src/ui/public/js/jquery-1.11.1.min.js       |     4 -
 .../src/ui/public/js/jquery.blockUI.min.js      |     6 -
 .../ui/public/js/jquery.cookies.2.2.0.min.js    |    18 -
 .../public/js/jquery.dataTables.1.10.4.min.js   |   157 -
 storm-core/src/ui/public/js/jquery.mustache.js  |   592 -
 storm-core/src/ui/public/js/js-yaml.min.js      |     3 -
 .../src/ui/public/js/jsonFormatter.min.js       |     2 -
 storm-core/src/ui/public/js/moment.min.js       |     6 -
 storm-core/src/ui/public/js/script.js           |   586 -
 .../src/ui/public/js/typeahead.jquery.min.js    |     7 -
 storm-core/src/ui/public/js/url.min.js          |     1 -
 storm-core/src/ui/public/js/vis.min.js          |    45 -
 storm-core/src/ui/public/js/visualization.js    |   367 -
 storm-core/src/ui/public/logviewer.html         |    27 -
 storm-core/src/ui/public/logviewer_search.html  |    72 -
 storm-core/src/ui/public/owner.html             |   211 -
 storm-core/src/ui/public/search_result.html     |   108 -
 storm-core/src/ui/public/supervisor.html        |   138 -
 .../templates/component-page-template.html      |   591 -
 .../deep-search-result-page-template.html       |    72 -
 .../public/templates/index-page-template.html   |   446 -
 .../public/templates/json-error-template.html   |    20 -
 .../logviewer-search-page-template.html         |    45 -
 .../public/templates/owner-page-template.html   |   239 -
 .../templates/search-result-page-template.html  |    60 -
 .../templates/supervisor-page-template.html     |   161 -
 .../templates/topology-page-template.html       |   700 -
 .../src/ui/public/templates/user-template.html  |    38 -
 storm-core/src/ui/public/topology.html          |   463 -
 storm-core/src/ui/public/visualize.html         |   124 -
 .../apache/storm/trident/integration_test.clj   |    18 +-
 .../test/clj/org/apache/storm/cluster_test.clj  |    21 +-
 .../test/clj/org/apache/storm/drpc_test.clj     |    20 +-
 .../storm/messaging/netty_integration_test.clj  |     1 -
 .../apache/storm/messaging/netty_unit_test.clj  |   354 -
 .../test/clj/org/apache/storm/metrics_test.clj  |   152 +-
 .../test/clj/org/apache/storm/nimbus_test.clj   |   148 +-
 .../scheduler/multitenant_scheduler_test.clj    |    38 +-
 .../clj/org/apache/storm/scheduler_test.clj     |     3 +
 .../storm/security/auth/nimbus_auth_test.clj    |     4 +-
 .../clj/org/apache/storm/transactional_test.clj |   706 -
 .../clj/org/apache/storm/trident/state_test.clj |     4 +-
 .../org/apache/storm/versioned_store_test.clj   |     2 +-
 .../test/jvm/org/apache/storm/MockAutoCred.java |    25 +-
 .../org/apache/storm/command/RebalanceTest.java |    21 +-
 .../apache/storm/command/SetLogLevelTest.java   |    21 +-
 .../jvm/org/apache/storm/command/TestCLI.java   |    92 +-
 .../apache/storm/messaging/netty/NettyTest.java |   439 +
 .../apache/storm/metric/FakeMetricConsumer.java |    57 +-
 .../nimbus/InMemoryTopologyActionNotifier.java  |    27 +-
 .../storm/serialization/SerializationTest.java  |    10 +-
 .../org/apache/storm/stats/TestStatsUtil.java   |    64 +-
 .../staticmocking/ConfigUtilsInstaller.java     |     3 +-
 .../staticmocking/ReflectionUtilsInstaller.java |     3 +-
 .../ServerConfigUtilsInstaller.java             |     3 +-
 .../utils/staticmocking/UtilsInstaller.java     |     3 +-
 .../storm/utils/staticmocking/package-info.java |    66 +-
 storm-core/test/resources/log4j2-test.xml       |     3 +-
 .../final-package/src/main/assembly/binary.xml  |    11 +-
 .../src/main/assembly/storm-webapp.xml          |     4 +
 .../src/main/resources/resources/storm.py       |    16 +-
 storm-server/pom.xml                            |    55 +-
 .../java/org/apache/storm/DaemonConfig.java     |   491 +-
 .../ILocalClusterTrackedTopologyAware.java      |    27 +-
 .../java/org/apache/storm/LocalCluster.java     |   877 +-
 .../main/java/org/apache/storm/LocalDRPC.java   |    32 +-
 .../java/org/apache/storm/ProcessSimulator.java |    34 +-
 .../src/main/java/org/apache/storm/Testing.java |   336 +-
 .../storm/blobstore/BlobKeySequenceInfo.java    |    35 +-
 .../apache/storm/blobstore/BlobStoreUtils.java  |    51 +-
 .../storm/blobstore/BlobSynchronizer.java       |   131 -
 .../storm/blobstore/FileBlobStoreImpl.java      |   156 +-
 .../storm/blobstore/KeySequenceNumber.java      |    49 +-
 .../storm/blobstore/LocalFsBlobStore.java       |   232 +-
 .../storm/blobstore/LocalFsBlobStoreFile.java   |    36 +-
 .../blobstore/LocalFsBlobStoreSynchronizer.java |   138 +
 .../container/ResourceIsolationInterface.java   |    18 +-
 .../storm/container/cgroup/CgroupManager.java   |    85 +-
 .../daemon/drpc/BlockingOutstandingRequest.java |    10 +-
 .../java/org/apache/storm/daemon/drpc/DRPC.java |   104 +-
 .../apache/storm/daemon/drpc/DRPCThrift.java    |     3 +-
 .../storm/daemon/drpc/OutstandingRequest.java   |     4 +-
 .../storm/daemon/drpc/RequestFactory.java       |     3 +-
 .../storm/daemon/metrics/MetricsUtils.java      |     1 -
 .../reporters/ConsolePreparableReporter.java    |    21 +-
 .../reporters/CsvPreparableReporter.java        |    21 +-
 .../reporters/JmxPreparableReporter.java        |    20 +-
 .../metrics/reporters/PreparableReporter.java   |    32 +-
 .../storm/daemon/nimbus/HeartbeatCache.java     |   218 +
 .../org/apache/storm/daemon/nimbus/Nimbus.java  |  2924 +-
 .../daemon/nimbus/TimedWritableByteChannel.java |    51 +
 .../apache/storm/daemon/nimbus/TopoCache.java   |    46 +-
 .../storm/daemon/nimbus/TopologyActions.java    |    23 +-
 .../storm/daemon/nimbus/TopologyResources.java  |   107 +-
 .../daemon/nimbus/TopologyStateTransition.java  |    23 +-
 .../storm/daemon/supervisor/BasicContainer.java |   715 +-
 .../supervisor/BasicContainerLauncher.java      |    39 +-
 .../storm/daemon/supervisor/Container.java      |   406 +-
 .../daemon/supervisor/ContainerLauncher.java    |    60 +-
 .../supervisor/ContainerMemoryTracker.java      |   160 +
 .../supervisor/ContainerRecoveryException.java  |    19 +-
 .../DefaultUncaughtExceptionHandler.java        |    20 +-
 .../supervisor/EventManagerPushCallback.java    |    19 +-
 .../storm/daemon/supervisor/Killable.java       |    27 +-
 .../storm/daemon/supervisor/LocalContainer.java |    31 +-
 .../supervisor/LocalContainerLauncher.java      |    31 +-
 .../daemon/supervisor/OnlyLatestExecutor.java   |     9 +-
 .../daemon/supervisor/ReadClusterState.java     |   123 +-
 .../daemon/supervisor/RunAsUserContainer.java   |    48 +-
 .../supervisor/RunAsUserContainerLauncher.java  |    42 +-
 .../apache/storm/daemon/supervisor/Slot.java    |  1069 +-
 .../storm/daemon/supervisor/SlotMetrics.java    |    46 +
 .../daemon/supervisor/StandaloneSupervisor.java |    32 +-
 .../storm/daemon/supervisor/Supervisor.java     |   250 +-
 .../daemon/supervisor/SupervisorUtils.java      |    64 +-
 .../supervisor/TimerDecoratedAssignment.java    |    34 +
 .../apache/storm/daemon/supervisor/UniFunc.java |    19 +-
 .../timer/ReportWorkerHeartbeats.java           |    21 +-
 .../supervisor/timer/SupervisorHealthCheck.java |     1 -
 .../supervisor/timer/SupervisorHeartbeat.java   |    24 +-
 .../timer/SynchronizeAssignments.java           |    45 +-
 .../org/apache/storm/event/EventManager.java    |    19 +-
 .../org/apache/storm/event/EventManagerImp.java |    30 +-
 .../apache/storm/healthcheck/HealthChecker.java |    19 +-
 .../apache/storm/localizer/AsyncLocalizer.java  |   488 +-
 .../storm/localizer/BlobChangingCallback.java   |    14 +-
 .../org/apache/storm/localizer/GoodToGo.java    |    46 +-
 .../org/apache/storm/localizer/IOFunction.java  |    22 +
 .../apache/storm/localizer/LocalResource.java   |    18 +-
 .../storm/localizer/LocalizedResource.java      |   162 +-
 .../LocalizedResourceRetentionSet.java          |    49 +-
 .../storm/localizer/LocallyCachedBlob.java      |   156 +-
 .../localizer/LocallyCachedTopologyBlob.java    |   206 +-
 .../storm/localizer/PortAndAssignment.java      |    74 +-
 .../storm/localizer/PortAndAssignmentImpl.java  |    79 +
 .../storm/localizer/TimePortAndAssignment.java  |    76 +
 .../storm/logging/ThriftAccessLogger.java       |    20 +-
 .../logging/filters/AccessLoggingFilter.java    |    21 +-
 .../metric/ClusterMetricsConsumerExecutor.java  |    32 +-
 .../metric/LoggingClusterMetricsConsumer.java   |    38 +-
 .../storm/metric/StormMetricsRegistry.java      |   118 +-
 .../org/apache/storm/metric/api/DataPoint.java  |    19 +-
 .../metric/api/IClusterMetricsConsumer.java     |    32 +-
 .../org/apache/storm/metric/timed/Timed.java    |    36 +
 .../storm/metric/timed/TimedResource.java       |    33 +
 .../storm/metric/timed/TimerDecorated.java      |    38 +
 .../org/apache/storm/metricstore/AggLevel.java  |    21 +-
 .../apache/storm/metricstore/FilterOptions.java |    79 +-
 .../org/apache/storm/metricstore/Metric.java    |    82 +-
 .../storm/metricstore/MetricException.java      |    19 +-
 .../apache/storm/metricstore/MetricStore.java   |    25 +-
 .../storm/metricstore/MetricStoreConfig.java    |    29 +-
 .../metricstore/NimbusMetricProcessor.java      |    23 +-
 .../metricstore/WorkerMetricsProcessor.java     |    19 +-
 .../storm/metricstore/rocksdb/KeyType.java      |    32 +-
 .../metricstore/rocksdb/MetricsCleaner.java     |    38 +-
 .../rocksdb/ReadOnlyStringMetadataCache.java    |    25 +-
 .../storm/metricstore/rocksdb/RocksDbKey.java   |   116 +-
 .../rocksdb/RocksDbMetricsWriter.java           |    35 +-
 .../storm/metricstore/rocksdb/RocksDbStore.java |    63 +-
 .../storm/metricstore/rocksdb/RocksDbValue.java |    25 +-
 .../metricstore/rocksdb/StringMetadata.java     |    19 +-
 .../rocksdb/StringMetadataCache.java            |    57 +-
 .../rocksdb/WritableStringMetadataCache.java    |    22 +-
 .../nimbus/AssignmentDistributionService.java   |   130 +-
 .../storm/nimbus/DefaultTopologyValidator.java  |    22 +-
 .../org/apache/storm/nimbus/ILeaderElector.java |    73 -
 .../nimbus/ITopologyActionNotifierPlugin.java   |    19 +-
 .../apache/storm/nimbus/ITopologyValidator.java |    23 +-
 .../IWorkerHeartbeatsRecoveryStrategy.java      |    18 +-
 .../storm/nimbus/LeaderListenerCallback.java    |    81 +-
 .../nimbus/NimbusHeartbeatsPressureTest.java    |   128 +-
 .../storm/nimbus/StrictTopologyValidator.java   |    33 +-
 ...TimeOutWorkerHeartbeatsRecoveryStrategy.java |    20 +-
 ...WorkerHeartbeatsRecoveryStrategyFactory.java |    26 +-
 .../storm/pacemaker/IServerMessageHandler.java  |    21 +-
 .../org/apache/storm/pacemaker/Pacemaker.java   |   146 +-
 .../apache/storm/pacemaker/PacemakerServer.java |   207 +-
 .../pacemaker/codec/ThriftNettyServerCodec.java |    99 +-
 .../org/apache/storm/scheduler/Cluster.java     |   425 +-
 .../org/apache/storm/scheduler/Component.java   |    22 +-
 .../storm/scheduler/DefaultScheduler.java       |     9 +-
 .../apache/storm/scheduler/EvenScheduler.java   |     8 +-
 .../apache/storm/scheduler/ExecutorDetails.java |    15 +-
 .../org/apache/storm/scheduler/INimbus.java     |    22 +-
 .../org/apache/storm/scheduler/IScheduler.java  |    22 +-
 .../storm/scheduler/ISchedulingState.java       |   138 +-
 .../org/apache/storm/scheduler/ISupervisor.java |    21 +-
 .../storm/scheduler/IsolationScheduler.java     |    51 +-
 .../storm/scheduler/SchedulerAssignment.java    |    20 +-
 .../scheduler/SchedulerAssignmentImpl.java      |    81 +-
 .../storm/scheduler/SingleTopologyCluster.java  |     2 +-
 .../storm/scheduler/SupervisorDetails.java      |    52 +-
 .../storm/scheduler/SupervisorResources.java    |     4 +-
 .../org/apache/storm/scheduler/Topologies.java  |    30 +-
 .../apache/storm/scheduler/TopologyDetails.java |   141 +-
 .../scheduler/blacklist/BlacklistScheduler.java |    62 +-
 .../blacklist/reporters/IReporter.java          |    18 +-
 .../blacklist/reporters/LogReporter.java        |    21 +-
 .../strategies/DefaultBlacklistStrategy.java    |   111 +-
 .../strategies/IBlacklistStrategy.java          |    19 +-
 .../strategies/RasBlacklistStrategy.java        |   103 +
 .../scheduler/multitenant/DefaultPool.java      |   363 +-
 .../storm/scheduler/multitenant/FreePool.java   |   182 +-
 .../scheduler/multitenant/IsolatedPool.java     |   617 +-
 .../multitenant/MultitenantScheduler.java       |   186 +-
 .../storm/scheduler/multitenant/Node.java       |   561 +-
 .../storm/scheduler/multitenant/NodePool.java   |   494 +-
 .../storm/scheduler/resource/RAS_Node.java      |   166 +-
 .../storm/scheduler/resource/RAS_Nodes.java     |     8 +-
 .../resource/ResourceAwareScheduler.java        |    92 +-
 .../storm/scheduler/resource/ResourceUtils.java |    49 +-
 .../scheduler/resource/SchedulingResult.java    |    20 +-
 .../scheduler/resource/SchedulingStatus.java    |    20 +-
 .../apache/storm/scheduler/resource/User.java   |    10 +-
 .../normalization/NormalizedResourceOffer.java  |    84 +-
 .../NormalizedResourceRequest.java              |   120 +-
 .../normalization/NormalizedResources.java      |   151 +-
 .../NormalizedResourcesWithMemory.java          |     9 +
 .../normalization/ResourceMapArrayBridge.java   |     8 +
 .../resource/normalization/ResourceMetrics.java |    34 +
 .../normalization/ResourceNameNormalizer.java   |    10 +-
 .../DefaultSchedulingPriorityStrategy.java      |    90 +-
 .../FIFOSchedulingPriorityStrategy.java         |    30 +-
 .../priority/ISchedulingPriorityStrategy.java   |    19 +-
 .../scheduling/BaseResourceAwareStrategy.java   |   650 +-
 .../scheduling/ConstraintSolverStrategy.java    |   737 +-
 .../DefaultResourceAwareStrategy.java           |   107 +-
 .../GenericResourceAwareStrategy.java           |   165 +-
 .../strategies/scheduling/IStrategy.java        |    23 +-
 .../utils/ArtifactoryConfigLoader.java          |   115 +-
 .../utils/ArtifactoryConfigLoaderFactory.java   |    18 +-
 .../utils/ConfigLoaderFactoryService.java       |    18 +-
 .../storm/scheduler/utils/FileConfigLoader.java |    19 +-
 .../utils/FileConfigLoaderFactory.java          |    18 +-
 .../storm/scheduler/utils/IConfigLoader.java    |    20 +-
 .../scheduler/utils/IConfigLoaderFactory.java   |    18 +-
 .../auth/DefaultHttpCredentialsPlugin.java      |    99 +
 .../security/auth/IHttpCredentialsPlugin.java   |    50 +
 .../storm/security/auth/ServerAuthUtils.java    |    62 +
 .../auth/workertoken/WorkerTokenManager.java    |    68 +-
 .../java/org/apache/storm/stats/StatsUtil.java  |  2385 ++
 .../storm/testing/CompleteTopologyParam.java    |   146 +-
 .../storm/testing/InProcessZookeeper.java       |    40 +-
 .../java/org/apache/storm/testing/TestJob.java  |    31 +-
 .../apache/storm/testing/TrackedTopology.java   |   164 +-
 .../apache/storm/utils/BufferInputStream.java   |    18 +-
 .../java/org/apache/storm/utils/EnumUtil.java   |    40 +
 .../java/org/apache/storm/utils/LruMap.java     |    20 +-
 .../apache/storm/utils/ServerConfigUtils.java   |    22 +-
 .../org/apache/storm/utils/ServerUtils.java     |   442 +-
 .../storm/utils/StormCommonInstaller.java       |    20 +-
 .../storm/utils/ZookeeperServerCnxnFactory.java |    77 +
 .../apache/storm/zookeeper/AclEnforcement.java  |   316 +
 .../storm/zookeeper/LeaderElectorImp.java       |    49 +-
 .../org/apache/storm/zookeeper/Zookeeper.java   |    76 +-
 .../java/org/apache/storm/DaemonConfigTest.java |    52 +-
 .../java/org/apache/storm/LocalStateTest.java   |    46 +-
 .../java/org/apache/storm/MessagingTest.java    |    72 +-
 .../java/org/apache/storm/PacemakerTest.java    |    58 +-
 .../test/java/org/apache/storm/TestCgroups.java |    51 +-
 .../apache/storm/TestDaemonConfigValidate.java  |    24 +-
 .../java/org/apache/storm/TestRebalance.java    |    49 +-
 .../test/java/org/apache/storm/TestingTest.java |    50 +-
 .../java/org/apache/storm/TickTupleTest.java    |    41 +-
 .../apache/storm/blobstore/BlobStoreTest.java   |   475 -
 .../storm/blobstore/BlobStoreUtilsTest.java     |    34 +-
 .../storm/blobstore/BlobSynchronizerTest.java   |   135 -
 .../LocalFsBlobStoreSynchronizerTest.java       |   136 +
 .../storm/blobstore/LocalFsBlobStoreTest.java   |   482 +
 .../blobstore/MockZookeeperClientBuilder.java   |    38 +-
 .../org/apache/storm/daemon/drpc/DRPCTest.java  |    72 +-
 .../apache/storm/daemon/nimbus/NimbusTest.java  |    30 +-
 .../daemon/supervisor/BasicContainerTest.java   |   777 +-
 .../storm/daemon/supervisor/ContainerTest.java  |   233 +-
 .../storm/daemon/supervisor/SlotTest.java       |   298 +-
 .../storm/localizer/AsyncLocalizerTest.java     |   416 +-
 .../LocalizedResourceRetentionSetTest.java      |    45 +-
 .../ClusterMetricsConsumerExecutorTest.java     |    73 +-
 .../metricstore/rocksdb/RocksDbStoreTest.java   |     5 +-
 .../apache/storm/nimbus/LocalNimbusTest.java    |    36 +-
 .../org/apache/storm/scheduler/ClusterTest.java |    24 +-
 .../scheduler/blacklist/FaultGenerateUtils.java |     4 +-
 .../blacklist/TestBlacklistScheduler.java       |    66 +-
 .../resource/TestResourceAwareScheduler.java    |   247 +-
 .../storm/scheduler/resource/TestUser.java      |    43 +-
 .../TestUtilsForResourceAwareScheduler.java     |   172 +-
 .../NormalizedResourceOfferTest.java            |    51 +
 .../NormalizedResourceRequestTest.java          |    54 +
 .../normalization/NormalizedResourcesTest.java  |    22 +-
 .../eviction/TestDefaultEvictionStrategy.java   |    13 +-
 .../TestFIFOSchedulingPriorityStrategy.java     |     9 +-
 .../TestConstraintSolverStrategy.java           |     9 +-
 .../TestDefaultResourceAwareStrategy.java       |    14 +-
 .../TestGenericResourceAwareStrategy.java       |    76 +-
 .../utils/ArtifactoryConfigLoaderTest.java      |   114 +-
 .../scheduler/utils/FileConfigLoaderTest.java   |    29 +-
 .../apache/storm/security/auth/AuthTest.java    |   351 +-
 .../auth/DefaultHttpCredentialsPluginTest.java  |    83 +
 .../security/auth/ServerAuthUtilsTest.java      |    62 +
 .../auth/workertoken/WorkerTokenTest.java       |     6 +-
 .../utils/ZookeeperServerCnxnFactoryTest.java   |    33 +
 .../submit/command/DependencyResolverMain.java  |    18 +-
 storm-webapp/pom.xml                            |   185 +-
 .../common/AuthorizationExceptionMapper.java    |    13 +-
 .../daemon/common/JsonResponseBuilder.java      |     2 +-
 .../apache/storm/daemon/drpc/DRPCServer.java    |    52 +-
 .../daemon/drpc/webapp/DRPCApplication.java     |     7 +-
 .../storm/daemon/drpc/webapp/DRPCResource.java  |    21 +-
 .../daemon/drpc/webapp/ReqContextFilter.java    |     4 +
 .../storm/daemon/logviewer/LogviewerServer.java |    44 +-
 .../handler/LogviewerLogDownloadHandler.java    |     7 +-
 .../handler/LogviewerLogPageHandler.java        |   129 +-
 .../handler/LogviewerLogSearchHandler.java      |   181 +-
 .../handler/LogviewerProfileHandler.java        |    16 +-
 .../daemon/logviewer/utils/DeletionMeta.java    |    31 +
 .../logviewer/utils/DirectoryCleaner.java       |   139 +-
 .../logviewer/utils/ExceptionMeterNames.java    |    60 +
 .../daemon/logviewer/utils/LogCleaner.java      |    73 +-
 .../logviewer/utils/LogFileDownloader.java      |    19 +-
 .../utils/LogviewerResponseBuilder.java         |    30 +-
 .../logviewer/utils/ResourceAuthorizer.java     |     6 +-
 .../daemon/logviewer/utils/WorkerLogs.java      |    29 +-
 .../logviewer/webapp/LogviewerApplication.java  |    26 +-
 .../logviewer/webapp/LogviewerResource.java     |   133 +-
 .../storm/daemon/ui/FilterConfiguration.java    |    68 +
 .../apache/storm/daemon/ui/IConfigurator.java   |    19 +
 .../daemon/ui/InvalidRequestException.java      |    38 +
 .../apache/storm/daemon/ui/TestingFilter.java   |    74 +
 .../org/apache/storm/daemon/ui/UIHelpers.java   |  2339 ++
 .../org/apache/storm/daemon/ui/UIServer.java    |   188 +
 .../storm/daemon/ui/WEB-INF/component.html      |   586 +
 .../ui/WEB-INF/css/bootstrap-3.3.1.min.css      |     5 +
 .../ui/WEB-INF/css/dataTables.bootstrap.css     |   319 +
 .../css/jquery.dataTables.1.10.4.min.css        |     1 +
 .../daemon/ui/WEB-INF/css/jsonFormatter.min.css |     1 +
 .../storm/daemon/ui/WEB-INF/css/style.css       |   263 +
 .../storm/daemon/ui/WEB-INF/css/vis.min.css     |     1 +
 .../daemon/ui/WEB-INF/deep_search_result.html   |   205 +
 .../apache/storm/daemon/ui/WEB-INF/favicon.ico  |   Bin 0 -> 18280 bytes
 .../apache/storm/daemon/ui/WEB-INF/flux.html    |   157 +
 .../daemon/ui/WEB-INF/images/back_disabled.png  |   Bin 0 -> 1361 bytes
 .../daemon/ui/WEB-INF/images/back_enabled.png   |   Bin 0 -> 1379 bytes
 .../ui/WEB-INF/images/back_enabled_hover.png    |   Bin 0 -> 1375 bytes
 .../storm/daemon/ui/WEB-INF/images/bolt.png     |   Bin 0 -> 6019 bytes
 .../storm/daemon/ui/WEB-INF/images/bug.png      |   Bin 0 -> 4045 bytes
 .../daemon/ui/WEB-INF/images/component.png      |   Bin 0 -> 699 bytes
 .../storm/daemon/ui/WEB-INF/images/flux.png     |   Bin 0 -> 5328 bytes
 .../ui/WEB-INF/images/forward_disabled.png      |   Bin 0 -> 1363 bytes
 .../ui/WEB-INF/images/forward_enabled.png       |   Bin 0 -> 1380 bytes
 .../ui/WEB-INF/images/forward_enabled_hover.png |   Bin 0 -> 1379 bytes
 .../storm/daemon/ui/WEB-INF/images/search.png   |   Bin 0 -> 2354 bytes
 .../storm/daemon/ui/WEB-INF/images/sort_asc.png |   Bin 0 -> 1118 bytes
 .../ui/WEB-INF/images/sort_asc_disabled.png     |   Bin 0 -> 2916 bytes
 .../daemon/ui/WEB-INF/images/sort_both.png      |   Bin 0 -> 1136 bytes
 .../daemon/ui/WEB-INF/images/sort_desc.png      |   Bin 0 -> 1127 bytes
 .../ui/WEB-INF/images/sort_desc_disabled.png    |   Bin 0 -> 1045 bytes
 .../storm/daemon/ui/WEB-INF/images/spinner.gif  |   Bin 0 -> 23470 bytes
 .../storm/daemon/ui/WEB-INF/images/spout.png    |   Bin 0 -> 5255 bytes
 .../daemon/ui/WEB-INF/images/statistic.png      |   Bin 0 -> 488 bytes
 .../storm/daemon/ui/WEB-INF/images/streams.png  |   Bin 0 -> 903 bytes
 .../apache/storm/daemon/ui/WEB-INF/index.html   |   232 +
 .../daemon/ui/WEB-INF/js/bootstrap-3.3.1.min.js |     7 +
 .../daemon/ui/WEB-INF/js/cytoscape-dagre.js     |   192 +
 .../storm/daemon/ui/WEB-INF/js/cytoscape.min.js |    63 +
 .../storm/daemon/ui/WEB-INF/js/dagre.min.js     |     6 +
 .../ui/WEB-INF/js/dataTables.bootstrap.min.js   |     8 +
 .../storm/daemon/ui/WEB-INF/js/esprima.min.js   |     2 +
 .../daemon/ui/WEB-INF/js/jquery-1.11.1.min.js   |     4 +
 .../daemon/ui/WEB-INF/js/jquery.blockUI.min.js  |     6 +
 .../ui/WEB-INF/js/jquery.cookies.2.2.0.min.js   |    18 +
 .../WEB-INF/js/jquery.dataTables.1.10.4.min.js  |   157 +
 .../daemon/ui/WEB-INF/js/jquery.mustache.js     |   592 +
 .../storm/daemon/ui/WEB-INF/js/js-yaml.min.js   |     3 +
 .../daemon/ui/WEB-INF/js/jsonFormatter.min.js   |     2 +
 .../storm/daemon/ui/WEB-INF/js/moment.min.js    |     6 +
 .../apache/storm/daemon/ui/WEB-INF/js/script.js |   588 +
 .../ui/WEB-INF/js/typeahead.jquery.min.js       |     7 +
 .../storm/daemon/ui/WEB-INF/js/url.min.js       |     1 +
 .../storm/daemon/ui/WEB-INF/js/vis.min.js       |    45 +
 .../storm/daemon/ui/WEB-INF/js/visualization.js |   367 +
 .../storm/daemon/ui/WEB-INF/logviewer.html      |    27 +
 .../daemon/ui/WEB-INF/logviewer_search.html     |    98 +
 .../apache/storm/daemon/ui/WEB-INF/owner.html   |   211 +
 .../storm/daemon/ui/WEB-INF/search_result.html  |   138 +
 .../storm/daemon/ui/WEB-INF/supervisor.html     |   142 +
 .../templates/component-page-template.html      |   591 +
 .../deep-search-result-page-template.html       |    72 +
 .../WEB-INF/templates/index-page-template.html  |   446 +
 .../WEB-INF/templates/json-error-template.html  |    20 +
 .../logviewer-search-page-template.html         |    45 +
 .../WEB-INF/templates/owner-page-template.html  |   239 +
 .../templates/search-result-page-template.html  |    60 +
 .../templates/supervisor-page-template.html     |   161 +
 .../templates/topology-page-template.html       |   700 +
 .../ui/WEB-INF/templates/user-template.html     |    41 +
 .../storm/daemon/ui/WEB-INF/topology.html       |   474 +
 .../storm/daemon/ui/WEB-INF/visualize.html      |   124 +
 .../AuthorizationExceptionMapper.java           |    40 +
 .../DefaultExceptionMapper.java                 |    48 +
 .../exceptionmappers/ExceptionMapperUtils.java  |    70 +
 .../NotAliveExceptionMapper.java                |    40 +
 .../daemon/ui/filters/AuthorizedUserFilter.java |   182 +
 .../daemon/ui/filters/HeaderResponseFilter.java |    49 +
 .../ui/filters/HeaderResponseServletFilter.java |    69 +
 .../storm/daemon/ui/resources/AuthNimbusOp.java |    39 +
 .../daemon/ui/resources/StormApiResource.java   |   697 +
 .../storm/daemon/drpc/DRPCServerTest.java       |     9 +-
 .../handler/LogviewerLogPageHandlerTest.java    |     4 +-
 .../handler/LogviewerLogSearchHandlerTest.java  |    12 +-
 .../testsupport/MockRemovableFileBuilder.java   |    29 +
 .../daemon/logviewer/utils/LogCleanerTest.java  |    66 +-
 .../daemon/logviewer/utils/WorkerLogsTest.java  |     3 +-
 2442 files changed, 133154 insertions(+), 150267 deletions(-)
----------------------------------------------------------------------



[3/8] storm git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm

Posted by pt...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm


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

Branch: refs/heads/master
Commit: 5c3a911c0aed922421f4fab387dfad550ec90b31
Parents: f991dae c8fab20
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Feb 13 12:13:02 2018 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Feb 13 12:13:02 2018 -0500

----------------------------------------------------------------------
 docs/SECURITY.md                                |   6 +-
 .../apache/storm/hive/bolt/TestHiveBolt.java    |  33 +-
 .../apache/storm/kafka/spout/KafkaSpout.java    |   8 +-
 storm-client/pom.xml                            |   2 +-
 .../src/jvm/org/apache/storm/Config.java        |   8 +
 .../storm/cluster/ClusterStateContext.java      |  22 +-
 .../org/apache/storm/cluster/ClusterUtils.java  |  58 +-
 .../org/apache/storm/cluster/DaemonType.java    |  90 ++-
 .../storm/cluster/IStormClusterState.java       |  67 +-
 .../cluster/PaceMakerStateStorageFactory.java   |   7 +-
 .../storm/cluster/StateStorageFactory.java      |   6 +-
 .../storm/cluster/StormClusterStateImpl.java    | 189 ++++-
 .../apache/storm/cluster/ZKStateStorage.java    |   4 +-
 .../storm/cluster/ZKStateStorageFactory.java    |   4 +-
 .../org/apache/storm/daemon/worker/Worker.java  |  35 +-
 .../apache/storm/daemon/worker/WorkerState.java |  52 +-
 .../jvm/org/apache/storm/executor/Executor.java |   4 +-
 .../storm/executor/bolt/BoltExecutor.java       |  21 +-
 .../storm/generated/PrivateWorkerKey.java       | 615 ++++++++++++++++
 .../org/apache/storm/generated/WorkerToken.java | 638 +++++++++++++++++
 .../apache/storm/generated/WorkerTokenInfo.java | 701 +++++++++++++++++++
 .../storm/generated/WorkerTokenServiceType.java |  62 ++
 .../grouping/LoadAwareShuffleGrouping.java      |  35 +-
 .../org/apache/storm/metric/api/IMetric.java    |   6 +-
 .../storm/metric/api/IMetricsRegistrant.java    |  30 +
 .../storm/security/INimbusCredentialPlugin.java |   7 +-
 .../auth/AbstractSaslClientCallbackHandler.java |  76 --
 .../auth/AbstractSaslServerCallbackHandler.java |  94 ---
 .../apache/storm/security/auth/AuthUtils.java   | 164 ++++-
 .../storm/security/auth/ITransportPlugin.java   |  12 +-
 .../apache/storm/security/auth/ReqContext.java  |  11 +
 .../security/auth/SaslTransportPlugin.java      | 187 -----
 .../security/auth/SimpleTransportPlugin.java    |   4 +-
 .../storm/security/auth/ThriftClient.java       |   2 +-
 .../security/auth/ThriftConnectionType.java     |  81 ++-
 .../storm/security/auth/ThriftServer.java       |  53 +-
 .../auth/digest/ClientCallbackHandler.java      |  58 --
 .../auth/digest/DigestSaslTransportPlugin.java  |  60 +-
 .../auth/digest/JassPasswordProvider.java       |  85 +++
 .../auth/digest/ServerCallbackHandler.java      |  85 ---
 .../storm/security/auth/kerberos/AutoTGT.java   |  73 +-
 .../kerberos/KerberosSaslTransportPlugin.java   |  73 +-
 .../auth/kerberos/ServerCallbackHandler.java    |  86 +--
 .../auth/plain/PlainClientCallbackHandler.java  |  16 +-
 .../auth/plain/PlainSaslTransportPlugin.java    |  18 +-
 .../auth/plain/PlainServerCallbackHandler.java  |  55 --
 .../security/auth/plain/SaslPlainServer.java    |   2 +
 .../security/auth/sasl/PasswordProvider.java    |  48 ++
 .../security/auth/sasl/SaslTransportPlugin.java | 187 +++++
 .../sasl/SimpleSaslClientCallbackHandler.java   |  77 ++
 .../sasl/SimpleSaslServerCallbackHandler.java   | 189 +++++
 .../auth/workertoken/WorkerTokenAuthorizer.java | 139 ++++
 .../WorkerTokenClientCallbackHandler.java       |  65 ++
 .../auth/workertoken/WorkerTokenSigner.java     |  63 ++
 .../org/apache/storm/utils/ObjectReader.java    |  12 +
 .../src/jvm/org/apache/storm/utils/Utils.java   |  39 +-
 storm-client/src/py/storm/ttypes.py             | 320 +++++++++
 storm-client/src/storm.thrift                   |  41 +-
 .../apache/storm/cluster/DaemonTypeTest.java    |  78 +++
 .../cluster/StormClusterStateImplTest.java      |  18 +-
 .../grouping/LoadAwareShuffleGroupingTest.java  |  33 +-
 .../security/auth/SaslTransportPluginTest.java  |   1 +
 .../org/apache/storm/command/AdminCommands.java |  24 +-
 .../org/apache/storm/command/Heartbeats.java    |   2 +-
 .../test/clj/org/apache/storm/cluster_test.clj  |  10 +-
 .../test/clj/org/apache/storm/nimbus_test.clj   |  47 +-
 .../apache/storm/security/auth/auth_test.clj    | 474 -------------
 .../security/auth/jaas_digest_bad_password.conf |  31 -
 .../auth/jaas_digest_missing_client.conf        |  23 -
 .../security/auth/jaas_digest_unknown_user.conf |  31 -
 .../storm/security/auth/nimbus_auth_test.clj    |   5 +-
 storm-server/pom.xml                            |   2 +-
 .../java/org/apache/storm/DaemonConfig.java     |  10 +-
 .../java/org/apache/storm/LocalCluster.java     |   7 +-
 .../src/main/java/org/apache/storm/Testing.java |   6 +-
 .../org/apache/storm/daemon/nimbus/Nimbus.java  |  76 +-
 .../storm/daemon/supervisor/Supervisor.java     |  24 +-
 .../daemon/supervisor/SupervisorUtils.java      |   7 -
 .../auth/workertoken/WorkerTokenManager.java    | 126 ++++
 .../apache/storm/security/auth/AuthTest.java    | 637 +++++++++++++++++
 .../auth/workertoken/WorkerTokenTest.java       | 159 +++++
 .../src/test/resources/jaas_digest.conf         |  30 +
 .../resources/jaas_digest_bad_password.conf     |  31 +
 .../resources/jaas_digest_missing_client.conf   |  23 +
 .../resources/jaas_digest_unknown_user.conf     |  31 +
 85 files changed, 5550 insertions(+), 1581 deletions(-)
----------------------------------------------------------------------



[4/8] storm git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm

Posted by pt...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm


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

Branch: refs/heads/master
Commit: 9f72f8b47869a312941ffe6331ac2b6f2ee5aeff
Parents: 5c3a911 4f5fdd9
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Apr 11 13:57:54 2018 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Apr 11 13:57:54 2018 -0400

----------------------------------------------------------------------
 .gitattributes                                  |   11 +-
 README.markdown                                 |    3 +-
 bin/flight.bash                                 |    6 +-
 conf/defaults.yaml                              |  117 +-
 docs/Concepts.md                                |    5 +
 docs/Distributed-RPC.md                         |   22 +-
 docs/Local-mode.md                              |    2 +-
 docs/Metrics.md                                 |    4 +-
 docs/Performance.md                             |  165 +
 docs/SECURITY.md                                |   27 +-
 docs/storm-eventhubs.md                         |   80 +-
 docs/storm-metricstore.md                       |    3 +
 examples/storm-elasticsearch-examples/pom.xml   |    2 +-
 .../elasticsearch/bolt/EsIndexTopology.java     |  121 +-
 .../storm/elasticsearch/bolt/package-info.java  |   20 +
 .../storm/elasticsearch/common/EsConstants.java |   22 +-
 .../storm/elasticsearch/common/EsTestUtil.java  |   71 +-
 .../elasticsearch/common/package-info.java      |   20 +
 .../trident/TridentEsTopology.java              |  137 +-
 .../elasticsearch/trident/package-info.java     |   20 +
 .../storm/hbase/topology/TotalWordCounter.java  |    1 -
 .../storm/hbase/topology/WordCounter.java       |    1 -
 .../apache/storm/hbase/topology/WordSpout.java  |    1 -
 .../storm/hdfs/spout/HdfsSpoutTopology.java     |    2 +-
 .../storm/hive/trident/TridentHiveTopology.java |    2 +-
 .../org/apache/storm/jdbc/spout/UserSpout.java  |    1 -
 .../jdbc/topology/AbstractUserTopology.java     |    2 +-
 .../apache/storm/jms/example/GenericBolt.java   |    1 -
 examples/storm-kafka-client-examples/pom.xml    |    6 -
 .../org/apache/storm/loadgen/CaptureLoad.java   |    4 +-
 .../loadgen/HttpForwardingMetricsServer.java    |    2 +-
 .../apache/storm/loadgen/LoadMetricsServer.java |    2 +-
 .../storm/loadgen/ThroughputVsLatency.java      |    5 +-
 .../mongodb/topology/TotalWordCounter.java      |    1 -
 .../storm/mongodb/topology/WordSpout.java       |    1 -
 examples/storm-mqtt-examples/pom.xml            |    2 +-
 .../mqtt/examples/CustomMessageMapper.java      |   50 +-
 .../mqtt/examples/MqttBrokerPublisher.java      |   65 +-
 .../storm/mqtt/examples/package-info.java       |   20 +
 examples/storm-perf/README.markdown             |    5 +-
 examples/storm-perf/pom.xml                     |   45 +-
 .../src/main/conf/KafkaClientHdfsTopo.yaml      |   26 +
 .../storm-perf/src/main/conf/KafkaHdfsTopo.yaml |   26 -
 .../src/main/conf/KafkaSpoutNullBoltTopo.yaml   |   23 -
 .../org/apache/storm/perf/BackPressureTopo.java |  115 +
 .../perf/ConstSpoutIdBoltNullBoltTopo.java      |   38 +-
 .../storm/perf/ConstSpoutNullBoltTopo.java      |   32 +-
 .../apache/storm/perf/ConstSpoutOnlyTopo.java   |    6 +-
 .../storm/perf/FileReadWordCountTopo.java       |   23 +-
 .../storm/perf/HdfsSpoutNullBoltTopo.java       |   46 +-
 .../org/apache/storm/perf/JCQueuePerfTest.java  |  380 ++
 .../org/apache/storm/perf/JCToolsPerfTest.java  |  227 +
 .../apache/storm/perf/KafkaClientHdfsTopo.java  |  172 +
 .../org/apache/storm/perf/KafkaHdfsTopo.java    |  169 -
 .../storm/perf/KafkaSpoutNullBoltTopo.java      |  115 -
 .../apache/storm/perf/LowThroughputTopo.java    |  157 +
 .../storm/perf/SimplifiedWordCountTopo.java     |   85 +
 .../storm/perf/StrGenSpoutHdfsBoltTopo.java     |   37 +-
 .../org/apache/storm/perf/ThroughputMeter.java  |   72 +
 .../org/apache/storm/perf/bolt/CountBolt.java   |    7 +-
 .../org/apache/storm/perf/bolt/DevNullBolt.java |   15 +-
 .../java/org/apache/storm/perf/bolt/IdBolt.java |    6 +-
 .../storm/perf/bolt/SplitSentenceBolt.java      |   19 +-
 .../org/apache/storm/perf/spout/ConstSpout.java |   23 +-
 .../apache/storm/perf/spout/FileReadSpout.java  |   54 +-
 .../apache/storm/perf/spout/StringGenSpout.java |   17 +-
 .../apache/storm/perf/spout/WordGenSpout.java   |  113 +
 .../storm/perf/utils/BasicMetricsCollector.java |   81 +-
 .../org/apache/storm/perf/utils/Helper.java     |    6 +-
 .../apache/storm/perf/utils/IdentityBolt.java   |    6 +-
 .../apache/storm/perf/utils/MetricsSample.java  |   61 +-
 .../storm/redis/topology/WordCounter.java       |    1 -
 .../apache/storm/redis/topology/WordSpout.java  |    1 -
 examples/storm-starter/README.markdown          |   14 +-
 .../apache/storm/starter/AnchoredWordCount.java |  139 +
 .../storm/starter/FastWordCountTopology.java    |    2 +-
 .../storm/starter/InOrderDeliveryTest.java      |    2 +-
 .../starter/ResourceAwareExampleTopology.java   |    2 +-
 .../storm/starter/bolt/RollingCountAggBolt.java |    1 -
 .../storm/starter/bolt/RollingCountBolt.java    |    1 -
 external/storm-autocreds/pom.xml                |   16 +
 .../storm/common/AbstractHadoopAutoCreds.java   |    4 +-
 .../AbstractHadoopNimbusPluginAutoCreds.java    |   12 +-
 .../apache/storm/hbase/security/AutoHBase.java  |    2 +-
 .../storm/hbase/security/AutoHBaseCommand.java  |    2 +-
 .../storm/hbase/security/AutoHBaseNimbus.java   |   12 +-
 .../apache/storm/hdfs/security/AutoHDFS.java    |    2 +-
 .../storm/hdfs/security/AutoHDFSCommand.java    |    2 +-
 .../storm/hdfs/security/AutoHDFSNimbus.java     |   15 +-
 .../storm/hdfs/security/HdfsSecurityUtil.java   |    2 +-
 .../apache/storm/hive/security/AutoHive.java    |    2 +-
 .../storm/hive/security/AutoHiveCommand.java    |    2 +-
 .../storm/hive/security/AutoHiveNimbus.java     |   14 +-
 .../impl/ObjectMapperCqlStatementMapper.java    |    2 +-
 .../trident/state/CassandraMapStateFactory.java |   10 +-
 .../trident/state/MapStateFactoryBuilder.java   |   10 +-
 .../apache/storm/cassandra/WeatherSpout.java    |    2 +-
 .../elasticsearch/bolt/AbstractEsBolt.java      |    2 +-
 .../storm/elasticsearch/bolt/EsIndexBolt.java   |    2 +-
 .../elasticsearch/bolt/EsPercolateBolt.java     |    2 +-
 .../storm/elasticsearch/common/EsTestUtil.java  |    2 +-
 external/storm-eventhubs/README.md              |   90 +-
 external/storm-eventhubs/pom.xml                |  164 +-
 .../eventhubs/bolt/DefaultEventDataFormat.java  |   94 +-
 .../storm/eventhubs/bolt/EventHubBolt.java      |  292 +-
 .../eventhubs/bolt/EventHubBoltConfig.java      |  222 +-
 .../storm/eventhubs/bolt/IEventDataFormat.java  |   56 +-
 .../eventhubs/spout/BinaryEventDataScheme.java  |    4 +-
 .../storm/eventhubs/spout/EventDataScheme.java  |  156 +-
 .../eventhubs/spout/EventHubReceiverImpl.java   |    4 +-
 .../storm/eventhubs/spout/EventHubSpout.java    |    2 +-
 .../storm/eventhubs/spout/FieldConstants.java   |   56 +-
 .../storm/eventhubs/spout/IEventDataScheme.java |   88 +-
 .../eventhubs/spout/IEventHubReceiver.java      |    2 +-
 .../spout/IEventHubReceiverFactory.java         |   60 +-
 .../eventhubs/spout/IPartitionCoordinator.java  |   54 +-
 .../eventhubs/spout/IPartitionManager.java      |   74 +-
 .../storm/eventhubs/spout/IStateStore.java      |   62 +-
 .../apache/storm/eventhubs/spout/MessageId.java |  112 +-
 .../eventhubs/spout/SimplePartitionManager.java |    2 +-
 .../eventhubs/spout/ZookeeperStateStore.java    |  190 +-
 .../storm/eventhubs/trident/Coordinator.java    |  120 +-
 .../trident/ITridentPartitionManager.java       |   70 +-
 .../ITridentPartitionManagerFactory.java        |   52 +-
 .../trident/OpaqueTridentEventHubEmitter.java   |  136 +-
 .../trident/OpaqueTridentEventHubSpout.java     |  128 +-
 .../storm/eventhubs/trident/Partition.java      |   78 +-
 .../storm/eventhubs/trident/Partitions.java     |   82 +-
 .../TransactionalTridentEventHubEmitter.java    |   10 +-
 .../TransactionalTridentEventHubSpout.java      |  132 +-
 .../storm/eventhubs/samples/EventHubLoop.java   |  104 +-
 .../samples/OpaqueTridentEventCount.java        |  106 +-
 .../samples/TransactionalTridentEventCount.java |  162 +-
 .../eventhubs/samples/bolt/GlobalCountBolt.java |  176 +-
 .../samples/bolt/PartialCountBolt.java          |  136 +-
 .../eventhubs/spout/EventHubReceiverMock.java   |    2 +-
 .../spout/SpoutOutputCollectorMock.java         |  137 +-
 .../storm/eventhubs/spout/StateStoreMock.java   |  108 +-
 .../storm/eventhubs/spout/TestEventData.java    |   94 +-
 .../TestTransactionalTridentEmitter.java        |    6 +-
 .../eventhubs/trident/TridentCollectorMock.java |  109 +-
 .../org/apache/storm/hbase/bolt/HBaseBolt.java  |    2 +-
 .../storm/hbase/bolt/HBaseLookupBolt.java       |    1 -
 .../hbase/state/HBaseKeyValueStateProvider.java |    4 +-
 .../hbase/trident/state/HBaseMapState.java      |    2 +-
 .../storm/hbase/trident/state/HBaseState.java   |    4 +-
 .../hbase/trident/state/HBaseStateFactory.java  |    2 +-
 .../storm/hdfs/bolt/AbstractHdfsBolt.java       |   18 +-
 .../hdfs/bolt/AvroGenericRecordBoltTest.java    |    2 +-
 .../apache/storm/hdfs/bolt/TestHdfsBolt.java    |    2 +-
 .../storm/hdfs/bolt/TestSequenceFileBolt.java   |    2 +-
 .../bolt/format/TestSimpleFileNameFormat.java   |   13 +-
 .../apache/storm/hdfs/spout/TestHdfsSpout.java  |   23 +-
 .../apache/storm/hive/bolt/TestHiveBolt.java    |    2 +-
 .../storm/hive/common/TestHiveWriter.java       |    2 +-
 .../storm/jdbc/bolt/AbstractJdbcBolt.java       |    2 +-
 .../apache/storm/jdbc/bolt/JdbcInsertBolt.java  |    2 +-
 .../storm/jdbc/trident/state/JdbcState.java     |    2 +-
 .../jdbc/trident/state/JdbcStateFactory.java    |    2 +-
 .../storm/jdbc/common/JdbcClientTest.java       |    2 +-
 .../storm/jms/trident/JmsStateFactory.java      |    2 +-
 .../storm/jms/trident/TridentJmsSpout.java      |    6 +-
 .../jms/spout/MockSpoutOutputCollector.java     |    5 +
 .../apache/storm/kafka/spout/KafkaSpout.java    |   76 +-
 .../storm/kafka/spout/KafkaSpoutConfig.java     |   44 +-
 .../storm/kafka/spout/KafkaSpoutMessageId.java  |   28 +-
 .../ManualPartitionSubscription.java            |   69 -
 .../spout/subscription/ManualPartitioner.java   |   13 +-
 .../spout/subscription/NamedTopicFilter.java    |    5 +-
 .../spout/subscription/PatternTopicFilter.java  |    6 +-
 .../RoundRobinManualPartitioner.java            |   11 +-
 .../kafka/spout/subscription/Subscription.java  |   57 -
 .../kafka/spout/subscription/TopicAssigner.java |   51 +
 .../kafka/spout/subscription/TopicFilter.java   |    8 +-
 .../trident/KafkaTridentSpoutBatchMetadata.java |   55 +-
 .../spout/trident/KafkaTridentSpoutEmitter.java |  130 +-
 .../spout/trident/KafkaTridentSpoutManager.java |  116 -
 .../spout/trident/KafkaTridentSpoutOpaque.java  |   26 +-
 .../KafkaTridentSpoutOpaqueCoordinator.java     |   43 +-
 .../KafkaTridentSpoutTopicPartition.java        |    6 +-
 ...KafkaTridentSpoutTopicPartitionRegistry.java |   47 -
 .../trident/KafkaTridentSpoutTransactional.java |   49 -
 .../kafka/spout/KafkaSpoutAbstractTest.java     |   13 +-
 .../storm/kafka/spout/KafkaSpoutEmitTest.java   |    7 +-
 .../KafkaSpoutLogCompactionSupportTest.java     |    5 +-
 .../spout/KafkaSpoutMessagingGuaranteeTest.java |   21 +-
 .../kafka/spout/KafkaSpoutNullTupleTest.java    |   93 +
 .../kafka/spout/KafkaSpoutReactivationTest.java |    3 +-
 .../kafka/spout/KafkaSpoutRebalanceTest.java    |   67 +-
 .../kafka/spout/KafkaSpoutRetryLimitTest.java   |   15 +-
 .../kafka/spout/MaxUncommittedOffsetTest.java   |    1 -
 .../SpoutWithMockedConsumerSetupHelper.java     |   25 +-
 .../SingleTopicKafkaSpoutConfiguration.java     |   10 +-
 .../ManualPartitionSubscriptionTest.java        |   79 -
 .../subscription/NamedTopicFilterTest.java      |    3 +-
 .../subscription/PatternTopicFilterTest.java    |    3 +-
 .../RoundRobinManualPartitionerTest.java        |   76 +
 .../spout/subscription/TopicAssignerTest.java   |   68 +
 .../KafkaTridentSpoutBatchMetadataTest.java     |   15 +-
 .../trident/KafkaTridentSpoutEmitterTest.java   |  214 +
 .../KafkaTridentSpoutOpaqueCoordinatorTest.java |  111 +
 external/storm-kafka-migration/README.md        |    8 +
 external/storm-kafka-migration/pom.xml          |  126 +
 .../conf/example-spout-migration-config.yaml    |   37 +
 .../example-trident-spout-migration-config.yaml |   35 +
 .../kafka/migration/KafkaSpoutMigration.java    |  162 +
 .../migration/KafkaTridentSpoutMigration.java   |  248 +
 .../apache/storm/kafka/migration/MapUtil.java   |   34 +
 external/storm-kafka-monitor/pom.xml            |    4 +
 external/storm-kafka/pom.xml                    |    4 +
 .../jvm/org/apache/storm/kafka/KafkaSpout.java  |    2 +-
 .../apache/storm/kafka/PartitionManager.java    |    2 +-
 .../jvm/org/apache/storm/kafka/SpoutConfig.java |    1 +
 .../src/jvm/org/apache/storm/kafka/ZkState.java |    7 +-
 .../kafka/trident/OpaqueTridentKafkaSpout.java  |   15 +-
 .../kafka/trident/TridentKafkaEmitter.java      |   37 +-
 .../storm/kafka/PartitionManagerTest.java       |    4 +
 .../apache/storm/kafka/ZkCoordinatorTest.java   |    4 +-
 .../apache/storm/kafka/bolt/KafkaBoltTest.java  |    4 +-
 external/storm-kinesis/pom.xml                  |    4 +
 external/storm-mongodb/README.md                |  650 +--
 .../storm/mongodb/bolt/AbstractMongoBolt.java   |  124 +-
 .../storm/mongodb/bolt/MongoInsertBolt.java     |  248 +-
 .../storm/mongodb/bolt/MongoUpdateBolt.java     |  186 +-
 .../storm/mongodb/common/MongoDbClient.java     |  218 +-
 .../mongodb/common/QueryFilterCreator.java      |   94 +-
 .../common/SimpleQueryFilterCreator.java        |   94 +-
 .../mongodb/common/mapper/MongoMapper.java      |   94 +-
 .../common/mapper/SimpleMongoMapper.java        |  110 +-
 .../common/mapper/SimpleMongoUpdateMapper.java  |   92 +-
 .../mongodb/trident/state/MongoMapState.java    |    4 +-
 .../storm/mongodb/trident/state/MongoState.java |  290 +-
 .../trident/state/MongoStateFactory.java        |   86 +-
 .../trident/state/MongoStateUpdater.java        |   70 +-
 .../storm/redis/bolt/AbstractRedisBolt.java     |    2 +-
 .../trident/state/RedisClusterMapState.java     |    2 +-
 .../redis/trident/state/RedisClusterState.java  |    2 +-
 .../redis/trident/state/RedisMapState.java      |    2 +-
 .../storm/redis/trident/state/RedisState.java   |    2 +-
 .../rocketmq/trident/state/RocketMqState.java   |    2 +-
 .../storm/solr/trident/SolrStateFactory.java    |    2 +-
 flux/README.md                                  |  137 +-
 flux/flux-core/pom.xml                          |    2 +-
 .../java/org/apache/storm/flux/FluxBuilder.java |   27 +-
 .../storm/flux/model/ConfigMethodDef.java       |    2 +-
 .../org/apache/storm/flux/model/ObjectDef.java  |    2 +-
 .../flux/test/OnlyValueRecordTranslator.java    |   37 +
 .../storm/flux/test/TridentTopologySource.java  |    1 -
 .../src/test/resources/configs/kafka_test.yaml  |   61 +-
 flux/flux-examples/README.md                    |    2 +-
 flux/flux-examples/pom.xml                      |    6 +-
 .../examples/OnlyValueRecordTranslator.java     |   37 +
 .../flux/examples/StatefulWordCounter.java      |    1 -
 .../apache/storm/flux/examples/WordCounter.java |    1 -
 .../src/main/resources/kafka_spout.yaml         |   71 +-
 integration-test/README.md                      |  118 +-
 integration-test/config/storm.yaml              |    4 +
 .../test/java/org/apache/storm/st/DemoTest.java |    1 +
 .../apache/storm/st/wrapper/StormCluster.java   |    2 +-
 pom.xml                                         |   54 +-
 storm-client/pom.xml                            |   19 +-
 .../src/jvm/org/apache/storm/Config.java        |  466 +-
 .../src/jvm/org/apache/storm/Constants.java     |    2 +-
 .../jvm/org/apache/storm/StormSubmitter.java    |    5 +-
 .../src/jvm/org/apache/storm/StormTimer.java    |   62 +-
 .../src/jvm/org/apache/storm/Thrift.java        |   46 +-
 .../assignments/ILocalAssignmentsBackend.java   |  116 +
 .../assignments/InMemoryAssignmentBackend.java  |  158 +
 .../LocalAssignmentsBackendFactory.java         |   48 +
 .../org/apache/storm/cluster/ClusterUtils.java  |   25 +-
 .../org/apache/storm/cluster/DaemonType.java    |    2 +
 .../storm/cluster/IStormClusterState.java       |  184 +-
 .../storm/cluster/PaceMakerStateStorage.java    |   31 +-
 .../cluster/PaceMakerStateStorageFactory.java   |    2 +-
 .../storm/cluster/StateStorageFactory.java      |    2 +-
 .../storm/cluster/StormClusterStateImpl.java    |  184 +-
 .../apache/storm/cluster/ZKStateStorage.java    |   19 +-
 .../storm/cluster/ZKStateStorageFactory.java    |    9 +-
 .../coordination/BatchOutputCollector.java      |    9 +-
 .../coordination/BatchOutputCollectorImpl.java  |    5 +
 .../coordination/BatchSubtopologyBuilder.java   |   21 +-
 .../storm/coordination/CoordinatedBolt.java     |    8 +-
 .../src/jvm/org/apache/storm/daemon/Acker.java  |    9 +-
 .../org/apache/storm/daemon/GrouperFactory.java |   11 +-
 .../org/apache/storm/daemon/StormCommon.java    |   10 +-
 .../src/jvm/org/apache/storm/daemon/Task.java   |  136 +-
 .../daemon/metrics/BuiltinMetricsUtil.java      |   32 +-
 .../daemon/metrics/ClientMetricsUtils.java      |   52 +
 .../daemon/metrics/SpoutThrottlingMetrics.java  |   13 +-
 .../supervisor/ClientSupervisorUtils.java       |    4 +-
 .../daemon/worker/BackPressureTracker.java      |   98 +
 .../org/apache/storm/daemon/worker/Worker.java  |  436 +-
 .../apache/storm/daemon/worker/WorkerState.java |  427 +-
 .../storm/daemon/worker/WorkerTransfer.java     |  144 +
 .../jvm/org/apache/storm/drpc/DRPCSpout.java    |    4 +-
 .../jvm/org/apache/storm/drpc/JoinResult.java   |    2 +-
 .../storm/drpc/LinearDRPCTopologyBuilder.java   |   28 +-
 .../org/apache/storm/drpc/PrepareRequest.java   |    2 +-
 .../org/apache/storm/drpc/ReturnResults.java    |    6 +-
 .../jvm/org/apache/storm/executor/Executor.java |  347 +-
 .../apache/storm/executor/ExecutorShutdown.java |   51 +-
 .../apache/storm/executor/ExecutorTransfer.java |   98 +-
 .../apache/storm/executor/IRunningExecutor.java |   13 +-
 .../apache/storm/executor/LocalExecutor.java    |   10 +-
 .../org/apache/storm/executor/TupleInfo.java    |    8 +
 .../storm/executor/bolt/BoltExecutor.java       |  174 +-
 .../executor/bolt/BoltOutputCollectorImpl.java  |  111 +-
 .../storm/executor/spout/SpoutExecutor.java     |  296 +-
 .../spout/SpoutOutputCollectorImpl.java         |   94 +-
 .../jvm/org/apache/storm/generated/HBNodes.java |   32 +-
 .../org/apache/storm/generated/HBRecords.java   |   36 +-
 .../jvm/org/apache/storm/generated/Nimbus.java  | 5135 +++++++++++++-----
 .../org/apache/storm/generated/Supervisor.java  | 2968 ++++++++++
 .../storm/generated/SupervisorAssignments.java  |  478 ++
 .../apache/storm/generated/SupervisorInfo.java  |  177 +-
 .../generated/SupervisorWorkerHeartbeat.java    |  660 +++
 .../generated/SupervisorWorkerHeartbeats.java   |  561 ++
 .../storm/generated/WorkerMetricList.java       |   36 +-
 .../storm/generated/WorkerTokenServiceType.java |    5 +-
 .../grouping/LoadAwareShuffleGrouping.java      |   12 +-
 .../apache/storm/grouping/ShuffleGrouping.java  |    9 +-
 .../storm/hooks/info/BoltExecuteInfo.java       |    3 +-
 .../DeserializingConnectionCallback.java        |    4 +-
 .../org/apache/storm/messaging/IConnection.java |   31 +-
 .../org/apache/storm/messaging/IContext.java    |   10 +-
 .../apache/storm/messaging/local/Context.java   |   30 +-
 .../messaging/netty/BackPressureStatus.java     |   75 +
 .../apache/storm/messaging/netty/Client.java    |  132 +-
 .../apache/storm/messaging/netty/Context.java   |    8 +-
 .../storm/messaging/netty/MessageDecoder.java   |   43 +-
 .../storm/messaging/netty/MessageEncoder.java   |   18 +-
 .../apache/storm/messaging/netty/Server.java    |   47 +-
 .../messaging/netty/StormClientHandler.java     |   43 +-
 .../netty/StormClientPipelineFactory.java       |   11 +-
 .../netty/StormServerPipelineFactory.java       |    6 +-
 .../jvm/org/apache/storm/metric/SystemBolt.java |    2 +-
 .../storm/metric/api/MultiCountMetric.java      |    4 +-
 .../storm/metric/api/MultiReducedMetric.java    |    4 +-
 .../org/apache/storm/metrics2/JcMetrics.java    |   45 +
 .../org/apache/storm/metrics2/SimpleGauge.java  |   38 +
 .../storm/metrics2/StormMetricRegistry.java     |  180 +
 .../org/apache/storm/metrics2/TaskMetrics.java  |   85 +
 .../storm/metrics2/filters/RegexFilter.java     |   48 +
 .../metrics2/filters/StormMetricsFilter.java    |   33 +
 .../reporters/ConsoleStormReporter.java         |   69 +
 .../metrics2/reporters/CsvStormReporter.java    |   97 +
 .../reporters/GangliaStormReporter.java         |  132 +
 .../reporters/GraphiteStormReporter.java        |  102 +
 .../metrics2/reporters/JmxStormReporter.java    |   92 +
 .../reporters/ScheduledStormReporter.java       |   86 +
 .../storm/metrics2/reporters/StormReporter.java |   35 +
 .../apache/storm/pacemaker/PacemakerClient.java |   72 +-
 .../storm/pacemaker/PacemakerClientPool.java    |   29 +-
 .../org/apache/storm/policy/IWaitStrategy.java  |   61 +
 .../apache/storm/policy/WaitStrategyPark.java   |   60 +
 .../storm/policy/WaitStrategyProgressive.java   |   76 +
 .../storm/security/auth/FixedGroupsMapping.java |    2 +-
 .../apache/storm/security/auth/IAuthorizer.java |    6 +-
 .../security/auth/ThriftConnectionType.java     |   29 +-
 .../auth/authorizer/DRPCAuthorizerBase.java     |    6 +-
 .../authorizer/DRPCSimpleACLAuthorizer.java     |    6 +-
 .../auth/authorizer/SimpleACLAuthorizer.java    |    7 +-
 .../SupervisorSimpleACLAuthorizer.java          |  157 +
 .../auth/digest/DigestSaslTransportPlugin.java  |    4 +-
 .../auth/digest/JassPasswordProvider.java       |    5 +
 .../kerberos/KerberosSaslTransportPlugin.java   |    6 +-
 .../auth/kerberos/ServerCallbackHandler.java    |   11 +-
 .../auth/plain/PlainSaslTransportPlugin.java    |    5 +-
 .../security/auth/sasl/PasswordProvider.java    |    8 +
 .../security/auth/sasl/SaslTransportPlugin.java |    5 +-
 .../sasl/SimpleSaslServerCallbackHandler.java   |   30 +-
 .../serialization/BlowfishTupleSerializer.java  |   30 +-
 .../serialization/KryoTupleDeserializer.java    |    6 +-
 .../serialization/KryoValuesDeserializer.java   |    4 +-
 .../serialization/KryoValuesSerializer.java     |    5 +-
 .../serialization/SerializationFactory.java     |    2 +
 .../serialization/types/HashMapSerializer.java  |    4 +-
 .../storm/spout/ISpoutOutputCollector.java      |    6 +
 .../apache/storm/spout/ISpoutWaitStrategy.java  |   34 -
 .../storm/spout/NothingEmptyEmitStrategy.java   |   31 -
 .../storm/spout/SleepSpoutWaitStrategy.java     |   41 -
 .../storm/spout/SpoutOutputCollector.java       |    9 +-
 .../storm/state/DefaultStateSerializer.java     |    2 +-
 .../apache/storm/stats/BoltExecutorStats.java   |   67 +-
 .../jvm/org/apache/storm/stats/CommonStats.java |   87 +-
 .../apache/storm/stats/SpoutExecutorStats.java  |   38 +-
 .../jvm/org/apache/storm/stats/StatsUtil.java   |  141 +-
 .../storm/task/GeneralTopologyContext.java      |   13 +-
 .../org/apache/storm/task/IOutputCollector.java |    2 +
 .../org/apache/storm/task/OutputCollector.java  |    7 +-
 .../org/apache/storm/task/TopologyContext.java  |   79 +-
 .../storm/testing/NonRichBoltTracker.java       |    2 +-
 .../org/apache/storm/testing/SpoutTracker.java  |   11 +-
 .../topology/BaseConfigurationDeclarer.java     |   26 +
 .../ComponentConfigurationDeclarer.java         |    7 +
 .../apache/storm/topology/TopologyBuilder.java  |   35 +-
 .../TransactionalTopologyBuilder.java           |   51 +-
 .../state/TestTransactionalState.java           |    2 +-
 .../transactional/state/TransactionalState.java |    8 +-
 .../apache/storm/trident/TridentTopology.java   |   12 +-
 .../trident/drpc/ReturnResultsReducer.java      |    4 +-
 .../trident/operation/TridentCollector.java     |    5 +
 .../operation/impl/CaptureCollector.java        |    5 +
 .../trident/operation/impl/GroupCollector.java  |    5 +
 .../storm/trident/planner/BridgeReceiver.java   |    6 +-
 .../storm/trident/planner/TupleReceiver.java    |    2 +-
 .../planner/processor/AggregateProcessor.java   |    7 +-
 .../planner/processor/AppendCollector.java      |    7 +
 .../planner/processor/EachProcessor.java        |    6 +
 .../planner/processor/FreshCollector.java       |    7 +
 .../trident/planner/processor/MapProcessor.java |    6 +
 .../processor/MultiReducerProcessor.java        |    6 +-
 .../processor/PartitionPersistProcessor.java    |    5 +
 .../planner/processor/ProjectedProcessor.java   |    7 +
 .../planner/processor/StateQueryProcessor.java  |    5 +
 .../spout/IOpaquePartitionedTridentSpout.java   |   21 +-
 .../OpaquePartitionedTridentSpoutExecutor.java  |   10 +-
 .../trident/spout/RichSpoutBatchExecutor.java   |    7 +-
 .../trident/spout/RichSpoutBatchTriggerer.java  |    5 +
 .../trident/spout/TridentSpoutExecutor.java     |    5 +
 .../trident/topology/TridentBoltExecutor.java   |    9 +-
 .../topology/TridentTopologyBuilder.java        |   48 +-
 .../topology/state/TransactionalState.java      |    8 +-
 .../windowing/AbstractTridentWindowManager.java |    5 +
 .../windowing/WindowTridentProcessor.java       |    5 +
 .../org/apache/storm/tuple/AddressedTuple.java  |   11 +-
 .../jvm/org/apache/storm/tuple/MessageId.java   |    7 +-
 .../jvm/org/apache/storm/tuple/TupleImpl.java   |   55 +-
 .../jvm/org/apache/storm/utils/ConfigUtils.java |   15 +-
 .../utils/DisruptorBackpressureCallback.java    |   27 -
 .../org/apache/storm/utils/DisruptorQueue.java  |  619 ---
 .../src/jvm/org/apache/storm/utils/JCQueue.java |  480 ++
 .../jvm/org/apache/storm/utils/MutableLong.java |    2 +-
 .../org/apache/storm/utils/NimbusClient.java    |    2 +-
 .../org/apache/storm/utils/ObjectReader.java    |    4 +
 .../jvm/org/apache/storm/utils/RotatingMap.java |    2 +-
 .../org/apache/storm/utils/SimpleVersion.java   |    2 +-
 .../apache/storm/utils/SupervisorClient.java    |   88 +
 .../src/jvm/org/apache/storm/utils/Time.java    |    8 +-
 .../org/apache/storm/utils/TransferDrainer.java |  199 +-
 .../jvm/org/apache/storm/utils/TupleUtils.java  |    2 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |  217 +-
 .../storm/utils/WorkerBackpressureCallback.java |   26 -
 .../storm/utils/WorkerBackpressureThread.java   |   80 -
 .../storm/validation/ConfigValidation.java      |  200 +-
 .../validation/ConfigValidationAnnotations.java |    9 +
 .../apache/storm/zookeeper/ClientZookeeper.java |    8 +-
 storm-client/src/py/storm/Nimbus-remote         |   21 +
 storm-client/src/py/storm/Nimbus.py             |  633 ++-
 storm-client/src/py/storm/Supervisor-remote     |  126 +
 storm-client/src/py/storm/Supervisor.py         |  694 +++
 storm-client/src/py/storm/__init__.py           |    2 +-
 storm-client/src/py/storm/ttypes.py             |  369 +-
 storm-client/src/storm.thrift                   |   46 +-
 .../org/apache/storm/TestConfigValidate.java    |   19 +-
 .../LocalAssignmentsBackendTest.java            |  102 +
 .../jvm/org/apache/storm/bolt/TestJoinBolt.java |   51 +-
 .../cluster/StormClusterStateImplTest.java      |   48 +-
 .../grouping/LoadAwareShuffleGroupingTest.java  |    4 +-
 .../DeserializingConnectionCallbackTest.java    |    4 +-
 .../apache/storm/security/auth/AutoSSLTest.java |   10 +-
 .../BlowfishTupleSerializerTest.java            |   45 +-
 .../apache/storm/streams/ProcessorBoltTest.java |    3 +-
 .../topology/WindowedBoltExecutorTest.java      |   16 +-
 .../storm/trident/TestTridentTopology.java      |  152 +-
 .../utils/DisruptorQueueBackpressureTest.java   |  110 -
 .../apache/storm/utils/DisruptorQueueTest.java  |  187 -
 .../storm/utils/JCQueueBackpressureTest.java    |   95 +
 .../jvm/org/apache/storm/utils/JCQueueTest.java |  209 +
 .../apache/storm/utils/SimpleVersionTest.java   |   69 +
 .../jvm/org/apache/storm/utils/UtilsTest.java   |   62 +-
 .../utils/WorkerBackpressureThreadTest.java     |   50 -
 .../storm/clojure/IndifferentAccessMap.java     |   17 +-
 storm-core/pom.xml                              |    4 +
 .../apache/storm/command/shell_submission.clj   |    2 +-
 .../apache/storm/command/UploadCredentials.java |    9 +-
 .../apache/storm/ui/FilterConfiguration.java    |   10 +-
 .../src/jvm/org/apache/storm/ui/UIHelpers.java  |    6 +-
 .../org/apache/storm/integration_test.clj       |   12 +-
 .../apache/storm/messaging/netty_unit_test.clj  |   42 +-
 .../test/clj/org/apache/storm/nimbus_test.clj   |   70 +-
 .../storm/security/auth/nimbus_auth_test.clj    |    4 +
 .../nimbus/InMemoryTopologyActionNotifier.java  |    2 +-
 .../storm/serialization/SerializationTest.java  |   12 +-
 .../org/apache/storm/stats/TestStatsUtil.java   |   10 +-
 storm-server/pom.xml                            |    4 +
 .../java/org/apache/storm/DaemonConfig.java     |   75 +-
 .../java/org/apache/storm/LocalCluster.java     |   19 +
 .../src/main/java/org/apache/storm/Testing.java |    9 +-
 .../storm/daemon/metrics/MetricsUtils.java      |   39 +-
 .../reporters/ConsolePreparableReporter.java    |   16 +-
 .../reporters/CsvPreparableReporter.java        |   17 +-
 .../reporters/JmxPreparableReporter.java        |   12 +-
 .../org/apache/storm/daemon/nimbus/Nimbus.java  |  534 +-
 .../storm/daemon/supervisor/BasicContainer.java |  112 +-
 .../supervisor/BasicContainerLauncher.java      |   13 +-
 .../storm/daemon/supervisor/Container.java      |   15 +-
 .../daemon/supervisor/ContainerLauncher.java    |   10 +-
 .../storm/daemon/supervisor/LocalContainer.java |    7 +-
 .../supervisor/LocalContainerLauncher.java      |    7 +-
 .../daemon/supervisor/ReadClusterState.java     |   69 +-
 .../daemon/supervisor/RunAsUserContainer.java   |   19 +-
 .../supervisor/RunAsUserContainerLauncher.java  |   15 +-
 .../apache/storm/daemon/supervisor/Slot.java    |   13 +-
 .../storm/daemon/supervisor/Supervisor.java     |  226 +-
 .../daemon/supervisor/SupervisorUtils.java      |   17 +-
 .../timer/ReportWorkerHeartbeats.java           |  112 +
 .../supervisor/timer/SupervisorHealthCheck.java |    6 +
 .../supervisor/timer/SupervisorHeartbeat.java   |   17 +-
 .../timer/SynchronizeAssignments.java           |  133 +
 .../apache/storm/healthcheck/HealthChecker.java |   10 +-
 .../apache/storm/localizer/AsyncLocalizer.java  |  139 +-
 .../storm/localizer/LocalizedResource.java      |    5 +
 .../storm/localizer/LocallyCachedBlob.java      |    5 +-
 .../apache/storm/metricstore/MetricStore.java   |    2 +-
 .../storm/metricstore/MetricStoreConfig.java    |   26 +-
 .../metricstore/NimbusMetricProcessor.java      |   41 +
 .../metricstore/WorkerMetricsProcessor.java     |   40 +
 .../storm/metricstore/rocksdb/RocksDbStore.java |    6 +-
 .../nimbus/AssignmentDistributionService.java   |  312 ++
 .../storm/nimbus/DefaultTopologyValidator.java  |   42 +-
 .../org/apache/storm/nimbus/ILeaderElector.java |    6 +-
 .../nimbus/ITopologyActionNotifierPlugin.java   |    2 +-
 .../apache/storm/nimbus/ITopologyValidator.java |    4 +-
 .../IWorkerHeartbeatsRecoveryStrategy.java      |   48 +
 .../storm/nimbus/LeaderListenerCallback.java    |  231 +
 .../nimbus/NimbusHeartbeatsPressureTest.java    |  241 +
 .../storm/nimbus/StrictTopologyValidator.java   |   67 +
 ...TimeOutWorkerHeartbeatsRecoveryStrategy.java |   80 +
 ...WorkerHeartbeatsRecoveryStrategyFactory.java |   53 +
 .../storm/scheduler/DefaultScheduler.java       |    2 +-
 .../apache/storm/scheduler/EvenScheduler.java   |    2 +-
 .../org/apache/storm/scheduler/IScheduler.java  |    2 +-
 .../storm/scheduler/IsolationScheduler.java     |    2 +-
 .../storm/scheduler/SupervisorDetails.java      |   27 +-
 .../scheduler/blacklist/BlacklistScheduler.java |    8 +-
 .../apache/storm/scheduler/blacklist/Sets.java  |  106 -
 .../strategies/DefaultBlacklistStrategy.java    |    2 +-
 .../strategies/IBlacklistStrategy.java          |    2 +-
 .../multitenant/MultitenantScheduler.java       |    7 +-
 .../resource/ResourceAwareScheduler.java        |    4 +-
 .../scheduling/BaseResourceAwareStrategy.java   |   14 +-
 .../utils/ArtifactoryConfigLoader.java          |   22 +-
 .../storm/scheduler/utils/FileConfigLoader.java |    6 +-
 .../org/apache/storm/utils/ServerUtils.java     |    2 +-
 .../storm/zookeeper/LeaderElectorImp.java       |   12 +-
 .../org/apache/storm/zookeeper/Zookeeper.java   |  145 +-
 .../java/org/apache/storm/TickTupleTest.java    |    3 +-
 .../daemon/supervisor/BasicContainerTest.java   |  244 +-
 .../storm/daemon/supervisor/ContainerTest.java  |   16 +-
 .../storm/daemon/supervisor/SlotTest.java       |   14 +-
 .../storm/localizer/AsyncLocalizerTest.java     |    5 +-
 .../scheduler/blacklist/FaultGenerateUtils.java |    2 +-
 .../TestUtilsForBlacklistScheduler.java         |   16 +-
 .../utils/ArtifactoryConfigLoaderTest.java      |   20 +-
 .../scheduler/utils/FileConfigLoaderTest.java   |   10 +-
 storm-webapp/pom.xml                            |   24 +-
 .../storm/daemon/logviewer/LogviewerServer.java |    7 +-
 .../logviewer/utils/DirectoryCleaner.java       |    2 +-
 .../logviewer/webapp/LogviewerResource.java     |    4 +-
 560 files changed, 28241 insertions(+), 10668 deletions(-)
----------------------------------------------------------------------