[3/3] storm git commit: Added STORM-849 to Changelog
Added STORM-849 to Changelog Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4a523ad8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4a523ad8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4a523ad8 Branch: refs/heads/master Commit: 4a523ad8f1ca50e8ba7b176453e727060bda7e09 Parents: 4b083f3 Author: Robert (Bobby) Evans ev...@yahoo-inc.com Authored: Fri Jun 5 08:53:59 2015 -0500 Committer: Robert (Bobby) Evans ev...@yahoo-inc.com Committed: Fri Jun 5 08:53:59 2015 -0500 -- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/4a523ad8/CHANGELOG.md -- diff --git a/CHANGELOG.md b/CHANGELOG.md index 549eee3..e85bfd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.11.0 ## 0.10.0 + * STORM-849: Add storm-redis to storm binary distribution * STORM-760: Use JSON for serialized conf * STORM-833: Logging framework logback - log4j 2.x * STORM-842: Drop Support for Java 1.6
[2/3] storm git commit: Merge branch 'add-storm-redis-to-storm-dist' of https://github.com/HeartSaVioR/storm into STORM-849
Merge branch 'add-storm-redis-to-storm-dist' of https://github.com/HeartSaVioR/storm into STORM-849 STORM-849: Add storm-redis to storm binary distribution Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4b083f31 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4b083f31 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4b083f31 Branch: refs/heads/master Commit: 4b083f314c3e9f905407536fcd090739f25e7e4d Parents: bf2ef23 b01a8c9 Author: Robert (Bobby) Evans ev...@yahoo-inc.com Authored: Fri Jun 5 08:53:29 2015 -0500 Committer: Robert (Bobby) Evans ev...@yahoo-inc.com Committed: Fri Jun 5 08:53:29 2015 -0500 -- storm-dist/binary/src/main/assembly/binary.xml | 14 ++ 1 file changed, 14 insertions(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/4b083f31/storm-dist/binary/src/main/assembly/binary.xml --
storm git commit: [maven-release-plugin] prepare for next development iteration
Repository: storm Updated Branches: refs/heads/0.10.x-branch 33d6c7404 - 64f46ebc5 [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/64f46ebc Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/64f46ebc Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/64f46ebc Branch: refs/heads/0.10.x-branch Commit: 64f46ebc59d901e936a20f9d5b07115b94f8d616 Parents: 33d6c74 Author: P. Taylor Goetz ptgo...@gmail.com Authored: Fri Jun 5 14:48:15 2015 -0400 Committer: P. Taylor Goetz ptgo...@gmail.com Committed: Fri Jun 5 14:48:15 2015 -0400 -- examples/storm-starter/pom.xml | 2 +- external/flux/flux-core/pom.xml | 2 +- external/flux/flux-examples/pom.xml | 2 +- external/flux/flux-wrappers/pom.xml | 2 +- external/flux/pom.xml| 2 +- external/storm-eventhubs/pom.xml | 2 +- external/storm-hbase/pom.xml | 2 +- external/storm-hdfs/pom.xml | 2 +- external/storm-hive/pom.xml | 2 +- external/storm-jdbc/pom.xml | 2 +- external/storm-kafka/pom.xml | 2 +- external/storm-redis/pom.xml | 2 +- pom.xml | 4 ++-- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 2 +- storm-core/pom.xml | 2 +- storm-dist/binary/pom.xml| 2 +- storm-dist/source/pom.xml| 2 +- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml | 2 +- storm-multilang/ruby/pom.xml | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/64f46ebc/examples/storm-starter/pom.xml -- diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml index eccbb29..f524062 100644 --- a/examples/storm-starter/pom.xml +++ b/examples/storm-starter/pom.xml @@ -20,7 +20,7 @@ parent artifactIdstorm/artifactId groupIdorg.apache.storm/groupId - version0.10.0/version + version0.10.1-SNAPSHOT/version relativePath../../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/64f46ebc/external/flux/flux-core/pom.xml -- diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml index e852a2a..90f9e6a 100644 --- a/external/flux/flux-core/pom.xml +++ b/external/flux/flux-core/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.storm/groupId artifactIdflux/artifactId -version0.10.0/version +version0.10.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/64f46ebc/external/flux/flux-examples/pom.xml -- diff --git a/external/flux/flux-examples/pom.xml b/external/flux/flux-examples/pom.xml index d7543ac..4e8d67d 100644 --- a/external/flux/flux-examples/pom.xml +++ b/external/flux/flux-examples/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.storm/groupId artifactIdflux/artifactId -version0.10.0/version +version0.10.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/64f46ebc/external/flux/flux-wrappers/pom.xml -- diff --git a/external/flux/flux-wrappers/pom.xml b/external/flux/flux-wrappers/pom.xml index 6ff542e..9b60526 100644 --- a/external/flux/flux-wrappers/pom.xml +++ b/external/flux/flux-wrappers/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.storm/groupId artifactIdflux/artifactId -version0.10.0/version +version0.10.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/64f46ebc/external/flux/pom.xml -- diff --git a/external/flux/pom.xml b/external/flux/pom.xml index 96840d7..cd356cf 100644 --- a/external/flux/pom.xml +++ b/external/flux/pom.xml @@ -26,7 +26,7 @@ parent artifactIdstorm/artifactId
storm git commit: [maven-release-plugin] prepare release v0.10.0
Repository: storm Updated Branches: refs/heads/0.10.x-branch 9c22d4546 - 33d6c7404 [maven-release-plugin] prepare release v0.10.0 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/33d6c740 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/33d6c740 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/33d6c740 Branch: refs/heads/0.10.x-branch Commit: 33d6c74041c286eb8b30b26bd0d6a76aa81a667f Parents: 9c22d45 Author: P. Taylor Goetz ptgo...@gmail.com Authored: Fri Jun 5 14:48:08 2015 -0400 Committer: P. Taylor Goetz ptgo...@gmail.com Committed: Fri Jun 5 14:48:08 2015 -0400 -- examples/storm-starter/pom.xml | 2 +- external/flux/flux-core/pom.xml | 2 +- external/flux/flux-examples/pom.xml | 2 +- external/flux/flux-wrappers/pom.xml | 2 +- external/flux/pom.xml| 2 +- external/storm-eventhubs/pom.xml | 2 +- external/storm-hbase/pom.xml | 2 +- external/storm-hdfs/pom.xml | 2 +- external/storm-hive/pom.xml | 2 +- external/storm-jdbc/pom.xml | 2 +- external/storm-kafka/pom.xml | 2 +- external/storm-redis/pom.xml | 2 +- pom.xml | 4 ++-- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 2 +- storm-core/pom.xml | 2 +- storm-dist/binary/pom.xml| 2 +- storm-dist/source/pom.xml| 2 +- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml | 2 +- storm-multilang/ruby/pom.xml | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/33d6c740/examples/storm-starter/pom.xml -- diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml index 152ea40..eccbb29 100644 --- a/examples/storm-starter/pom.xml +++ b/examples/storm-starter/pom.xml @@ -20,7 +20,7 @@ parent artifactIdstorm/artifactId groupIdorg.apache.storm/groupId - version0.10.0-SNAPSHOT/version + version0.10.0/version relativePath../../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/33d6c740/external/flux/flux-core/pom.xml -- diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml index 7adc8c2..e852a2a 100644 --- a/external/flux/flux-core/pom.xml +++ b/external/flux/flux-core/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.storm/groupId artifactIdflux/artifactId -version0.10.0-SNAPSHOT/version +version0.10.0/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/33d6c740/external/flux/flux-examples/pom.xml -- diff --git a/external/flux/flux-examples/pom.xml b/external/flux/flux-examples/pom.xml index 4c9267e..d7543ac 100644 --- a/external/flux/flux-examples/pom.xml +++ b/external/flux/flux-examples/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.storm/groupId artifactIdflux/artifactId -version0.10.0-SNAPSHOT/version +version0.10.0/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/33d6c740/external/flux/flux-wrappers/pom.xml -- diff --git a/external/flux/flux-wrappers/pom.xml b/external/flux/flux-wrappers/pom.xml index 898f777..6ff542e 100644 --- a/external/flux/flux-wrappers/pom.xml +++ b/external/flux/flux-wrappers/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.storm/groupId artifactIdflux/artifactId -version0.10.0-SNAPSHOT/version +version0.10.0/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/33d6c740/external/flux/pom.xml -- diff --git a/external/flux/pom.xml b/external/flux/pom.xml index 6616111..96840d7 100644 --- a/external/flux/pom.xml +++ b/external/flux/pom.xml @@ -26,7 +26,7 @@ parent artifactIdstorm/artifactId groupIdorg.apache.storm/groupId
Git Push Summary
Repository: storm Updated Tags: refs/tags/v0.10.0 [created] 29e682859
Git Push Summary
Repository: storm Updated Tags: refs/tags/v0.10.0 [deleted] 54d54e181
[2/2] storm git commit: Added STORM-850 to Changelog
Added STORM-850 to Changelog Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/750c8a41 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/750c8a41 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/750c8a41 Branch: refs/heads/0.10.x-branch Commit: 750c8a4155c94b9d7c0c6993a31b21ca83ba1770 Parents: 3038ce8 Author: Robert (Bobby) Evans ev...@yahoo-inc.com Authored: Fri Jun 5 12:26:25 2015 -0500 Committer: Robert (Bobby) Evans ev...@yahoo-inc.com Committed: Fri Jun 5 12:26:25 2015 -0500 -- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/750c8a41/CHANGELOG.md -- diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bf8819..5318a8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## 0.10.0 + * STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml * STORM-848: Shade external dependencies * STORM-849: Add storm-redis to storm binary distribution * STORM-760: Use JSON for serialized conf
[2/3] storm git commit: Merge branch 'STORM-850' of https://github.com/HeartSaVioR/storm into STORM-850
Merge branch 'STORM-850' of https://github.com/HeartSaVioR/storm into STORM-850 STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b63cfd8d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b63cfd8d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b63cfd8d Branch: refs/heads/master Commit: b63cfd8d54ad89e1deb61059beee3e1a638dea27 Parents: 2f93835 4ca39f1 Author: Robert (Bobby) Evans ev...@yahoo-inc.com Authored: Fri Jun 5 12:13:29 2015 -0500 Committer: Robert (Bobby) Evans ev...@yahoo-inc.com Committed: Fri Jun 5 12:13:29 2015 -0500 -- storm-core/test/resources/log4j2-test.xml | 32 + storm-core/test/resources/logback-test.xml | 26 2 files changed, 32 insertions(+), 26 deletions(-) --
storm git commit: rollback release 0.10.0
Repository: storm Updated Branches: refs/heads/0.10.x-branch 750c8a415 - 9c22d4546 rollback release 0.10.0 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9c22d454 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9c22d454 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9c22d454 Branch: refs/heads/0.10.x-branch Commit: 9c22d454646d76b21908ea8b9c92aa8fdedf6f24 Parents: 750c8a4 Author: P. Taylor Goetz ptgo...@gmail.com Authored: Fri Jun 5 14:21:04 2015 -0400 Committer: P. Taylor Goetz ptgo...@gmail.com Committed: Fri Jun 5 14:21:04 2015 -0400 -- examples/storm-starter/pom.xml | 2 +- external/flux/flux-core/pom.xml | 2 +- external/flux/flux-examples/pom.xml | 2 +- external/flux/flux-wrappers/pom.xml | 2 +- external/flux/pom.xml| 2 +- external/storm-eventhubs/pom.xml | 3 +-- external/storm-hbase/pom.xml | 2 +- external/storm-hdfs/pom.xml | 2 +- external/storm-hive/pom.xml | 2 +- external/storm-jdbc/pom.xml | 2 +- external/storm-kafka/pom.xml | 2 +- external/storm-redis/pom.xml | 2 +- pom.xml | 2 +- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 2 +- storm-core/pom.xml | 2 +- storm-dist/binary/pom.xml| 2 +- storm-dist/source/pom.xml| 2 +- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml | 2 +- storm-multilang/ruby/pom.xml | 2 +- 21 files changed, 21 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/9c22d454/examples/storm-starter/pom.xml -- diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml index f524062..152ea40 100644 --- a/examples/storm-starter/pom.xml +++ b/examples/storm-starter/pom.xml @@ -20,7 +20,7 @@ parent artifactIdstorm/artifactId groupIdorg.apache.storm/groupId - version0.10.1-SNAPSHOT/version + version0.10.0-SNAPSHOT/version relativePath../../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/9c22d454/external/flux/flux-core/pom.xml -- diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml index 90f9e6a..7adc8c2 100644 --- a/external/flux/flux-core/pom.xml +++ b/external/flux/flux-core/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.storm/groupId artifactIdflux/artifactId -version0.10.1-SNAPSHOT/version +version0.10.0-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/9c22d454/external/flux/flux-examples/pom.xml -- diff --git a/external/flux/flux-examples/pom.xml b/external/flux/flux-examples/pom.xml index 4e8d67d..4c9267e 100644 --- a/external/flux/flux-examples/pom.xml +++ b/external/flux/flux-examples/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.storm/groupId artifactIdflux/artifactId -version0.10.1-SNAPSHOT/version +version0.10.0-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/9c22d454/external/flux/flux-wrappers/pom.xml -- diff --git a/external/flux/flux-wrappers/pom.xml b/external/flux/flux-wrappers/pom.xml index 9b60526..898f777 100644 --- a/external/flux/flux-wrappers/pom.xml +++ b/external/flux/flux-wrappers/pom.xml @@ -21,7 +21,7 @@ parent groupIdorg.apache.storm/groupId artifactIdflux/artifactId -version0.10.1-SNAPSHOT/version +version0.10.0-SNAPSHOT/version relativePath../pom.xml/relativePath /parent http://git-wip-us.apache.org/repos/asf/storm/blob/9c22d454/external/flux/pom.xml -- diff --git a/external/flux/pom.xml b/external/flux/pom.xml index cd356cf..6616111 100644 --- a/external/flux/pom.xml +++ b/external/flux/pom.xml @@ -26,7 +26,7 @@ parent artifactIdstorm/artifactId
[1/2] storm git commit: Merge branch 'STORM-850' of https://github.com/HeartSaVioR/storm into STORM-850
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 446c88267 - 750c8a415
Merge branch 'STORM-850' of https://github.com/HeartSaVioR/storm into STORM-850
STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3038ce8f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3038ce8f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3038ce8f
Branch: refs/heads/0.10.x-branch
Commit: 3038ce8f6595a0ac89eb7e6520abb990664a9c9e
Parents: 446c882
Author: Robert (Bobby) Evans ev...@yahoo-inc.com
Authored: Fri Jun 5 12:13:29 2015 -0500
Committer: Robert (Bobby) Evans ev...@yahoo-inc.com
Committed: Fri Jun 5 12:26:03 2015 -0500
--
storm-core/test/resources/log4j2-test.xml | 32 +
storm-core/test/resources/logback-test.xml | 26
2 files changed, 32 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/storm/blob/3038ce8f/storm-core/test/resources/log4j2-test.xml
--
diff --git a/storm-core/test/resources/log4j2-test.xml
b/storm-core/test/resources/log4j2-test.xml
new file mode 100644
index 000..4b12147
--- /dev/null
+++ b/storm-core/test/resources/log4j2-test.xml
@@ -0,0 +1,32 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the License); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ 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.
+--
+
+configuration monitorInterval=60
+Appenders
+Console name=Console target=SYSTEM_OUT
+PatternLayout pattern=%-4r [%t] %-5p %c{1.} - %msg%n/
+/Console
+/Appenders
+Loggers
+Logger name=org.apache.zookeeper level=WARN/
+Root level=${env:LOG_LEVEL:-INFO}
+AppenderRef ref=Console/
+/Root
+/Loggers
+/configuration
+
http://git-wip-us.apache.org/repos/asf/storm/blob/3038ce8f/storm-core/test/resources/logback-test.xml
--
diff --git a/storm-core/test/resources/logback-test.xml
b/storm-core/test/resources/logback-test.xml
deleted file mode 100644
index 346b8ca..000
--- a/storm-core/test/resources/logback-test.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-?xml version=1.0?
-!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the License); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an AS IS BASIS,
- 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.
---
-configuration scan=true scanPeriod=30 seconds
-appender name=A1 class=ch.qos.logback.core.ConsoleAppender
-encoder
-pattern%-4r [%t] %-5p %c - %m%n/pattern
-/encoder
-/appender
-logger name=org.apache.zookeeper level=WARN/
-root level=${LOG_LEVEL:-INFO}
-appender-ref ref=A1/
-/root
-/configuration
\ No newline at end of file
[1/4] storm git commit: Shade external dependencies
Repository: storm
Updated Branches:
refs/heads/master 4a523ad8f - 2f9383547
Shade external dependencies
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9ecf26cf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9ecf26cf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9ecf26cf
Branch: refs/heads/master
Commit: 9ecf26cfb1b29ef369a4a99de85e2237645306c3
Parents: 2154048
Author: Kishor Patil kpa...@yahoo-inc.com
Authored: Thu Jun 4 14:35:49 2015 +
Committer: Kishor Patil kpa...@yahoo-inc.com
Committed: Thu Jun 4 16:52:49 2015 +
--
external/flux/flux-core/pom.xml| 4 +
external/storm-hdfs/pom.xml| 4 +
external/storm-jdbc/pom.xml| 4 +
external/storm-kafka/pom.xml | 8 +
pom.xml| 18 +-
storm-core/pom.xml | 221 +++-
storm-dist/binary/src/main/assembly/binary.xml | 29 +++
7 files changed, 266 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index f74d034..8787823 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -54,6 +54,10 @@
version${project.version}/version
scopetest/scope
/dependency
+dependency
+groupIdorg.yaml/groupId
+artifactIdsnakeyaml/artifactId
+/dependency
/dependencies
build
resources
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 5b59eb1..7e927bf 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -54,6 +54,10 @@
/exclusions
/dependency
dependency
+groupIdorg.yaml/groupId
+artifactIdsnakeyaml/artifactId
+/dependency
+dependency
groupIdorg.apache.hadoop/groupId
artifactIdhadoop-hdfs/artifactId
version2.2.0/version
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/external/storm-jdbc/pom.xml
--
diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml
index cc4c09b..4e7c884 100644
--- a/external/storm-jdbc/pom.xml
+++ b/external/storm-jdbc/pom.xml
@@ -74,6 +74,10 @@
version2.3.1/version
scopetest/scope
/dependency
+dependency
+groupIdcommons-lang/groupId
+artifactIdcommons-lang/artifactId
+/dependency
/dependencies
build
plugins
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 9296e0b..0aba519 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -134,5 +134,13 @@
version${project.version}/version
scopeprovided/scope
/dependency
+dependency
+groupIdcommons-lang/groupId
+artifactIdcommons-lang/artifactId
+/dependency
+dependency
+groupIdcom.googlecode.json-simple/groupId
+artifactIdjson-simple/artifactId
+/dependency
/dependencies
/project
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index abae7fb..db12e25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,13 +215,13 @@
clojure.tools.nrepl.version0.2.3/clojure.tools.nrepl.version
clojure-complete.version0.2.3/clojure-complete.version
mockito.version1.9.5/mockito.version
-reply.version0.3.0/reply.version
conjure.version2.1.3/conjure.version
zookeeper.version3.4.6/zookeeper.version
clojure-data-codec.version0.1.0/clojure-data-codec.version
clojure-contrib.version1.2.0/clojure-contrib.version
hive.version0.14.0/hive.version
hadoop.version2.6.0/hadoop.version
+kryo.version2.21/kryo.version
/properties
profiles
@@ -322,6 +322,11 @@
version${clojure.version}/version
/dependency
dependency
+groupIdcom.esotericsoftware.kryo/groupId
+artifactIdkryo/artifactId
+
[1/4] storm git commit: Shade external dependencies
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 266f9b1a4 - 446c88267
Shade external dependencies
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9ecf26cf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9ecf26cf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9ecf26cf
Branch: refs/heads/0.10.x-branch
Commit: 9ecf26cfb1b29ef369a4a99de85e2237645306c3
Parents: 2154048
Author: Kishor Patil kpa...@yahoo-inc.com
Authored: Thu Jun 4 14:35:49 2015 +
Committer: Kishor Patil kpa...@yahoo-inc.com
Committed: Thu Jun 4 16:52:49 2015 +
--
external/flux/flux-core/pom.xml| 4 +
external/storm-hdfs/pom.xml| 4 +
external/storm-jdbc/pom.xml| 4 +
external/storm-kafka/pom.xml | 8 +
pom.xml| 18 +-
storm-core/pom.xml | 221 +++-
storm-dist/binary/src/main/assembly/binary.xml | 29 +++
7 files changed, 266 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index f74d034..8787823 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -54,6 +54,10 @@
version${project.version}/version
scopetest/scope
/dependency
+dependency
+groupIdorg.yaml/groupId
+artifactIdsnakeyaml/artifactId
+/dependency
/dependencies
build
resources
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 5b59eb1..7e927bf 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -54,6 +54,10 @@
/exclusions
/dependency
dependency
+groupIdorg.yaml/groupId
+artifactIdsnakeyaml/artifactId
+/dependency
+dependency
groupIdorg.apache.hadoop/groupId
artifactIdhadoop-hdfs/artifactId
version2.2.0/version
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/external/storm-jdbc/pom.xml
--
diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml
index cc4c09b..4e7c884 100644
--- a/external/storm-jdbc/pom.xml
+++ b/external/storm-jdbc/pom.xml
@@ -74,6 +74,10 @@
version2.3.1/version
scopetest/scope
/dependency
+dependency
+groupIdcommons-lang/groupId
+artifactIdcommons-lang/artifactId
+/dependency
/dependencies
build
plugins
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 9296e0b..0aba519 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -134,5 +134,13 @@
version${project.version}/version
scopeprovided/scope
/dependency
+dependency
+groupIdcommons-lang/groupId
+artifactIdcommons-lang/artifactId
+/dependency
+dependency
+groupIdcom.googlecode.json-simple/groupId
+artifactIdjson-simple/artifactId
+/dependency
/dependencies
/project
http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index abae7fb..db12e25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,13 +215,13 @@
clojure.tools.nrepl.version0.2.3/clojure.tools.nrepl.version
clojure-complete.version0.2.3/clojure-complete.version
mockito.version1.9.5/mockito.version
-reply.version0.3.0/reply.version
conjure.version2.1.3/conjure.version
zookeeper.version3.4.6/zookeeper.version
clojure-data-codec.version0.1.0/clojure-data-codec.version
clojure-contrib.version1.2.0/clojure-contrib.version
hive.version0.14.0/hive.version
hadoop.version2.6.0/hadoop.version
+kryo.version2.21/kryo.version
/properties
profiles
@@ -322,6 +322,11 @@
version${clojure.version}/version
/dependency
dependency
+groupIdcom.esotericsoftware.kryo/groupId
+artifactIdkryo/artifactId
+
[2/4] storm git commit: Shading Jetty
Shading Jetty Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6168ae4e Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6168ae4e Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6168ae4e Branch: refs/heads/0.10.x-branch Commit: 6168ae4e9ccf2301df8ce742ab4455a8713df4f0 Parents: 9ecf26c Author: Kishor Patil kpa...@yahoo-inc.com Authored: Thu Jun 4 21:21:30 2015 + Committer: Kishor Patil kpa...@yahoo-inc.com Committed: Thu Jun 4 21:21:30 2015 + -- storm-core/pom.xml | 5 + storm-dist/binary/src/main/assembly/binary.xml | 1 + 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/6168ae4e/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 69c2f0e..c43c6b2 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -424,6 +424,7 @@ includeorg.clojure:tools.cli/include includeorg.clojure:tools.macro/include includejoda-time:joda-time/include +includeorg.eclipse.jetty:*/include /includes /artifactSet @@ -564,6 +565,10 @@ patternorg.joda.time/pattern shadedPatternorg.apache.storm.joda.time/shadedPattern /relocation +relocation + patternorg.eclipse.jetty/pattern + shadedPatternorg.apache.storm.jetty/shadedPattern +/relocation /relocations transformers transformer implementation=org.apache.storm.maven.shade.clojure.ClojureTransformer / http://git-wip-us.apache.org/repos/asf/storm/blob/6168ae4e/storm-dist/binary/src/main/assembly/binary.xml -- diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml index a435312..3662424 100644 --- a/storm-dist/binary/src/main/assembly/binary.xml +++ b/storm-dist/binary/src/main/assembly/binary.xml @@ -58,6 +58,7 @@ excludeorg.clojure:tools.cli/exclude excludeorg.clojure:tools.macro/exclude excludejoda-time:joda-time/exclude +excludeorg.eclipse.jetty:*/exclude /excludes /dependencySet /dependencySets
[4/4] storm git commit: Added STORM-848 to Changelog
Added STORM-848 to Changelog Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/446c8826 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/446c8826 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/446c8826 Branch: refs/heads/0.10.x-branch Commit: 446c88267d337ad089f8791952ab798a813dd992 Parents: ba32efd Author: Robert (Bobby) Evans ev...@yahoo-inc.com Authored: Fri Jun 5 11:37:36 2015 -0500 Committer: Robert (Bobby) Evans ev...@yahoo-inc.com Committed: Fri Jun 5 11:37:36 2015 -0500 -- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/446c8826/CHANGELOG.md -- diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d72590..1bf8819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## 0.10.0 + * STORM-848: Shade external dependencies * STORM-849: Add storm-redis to storm binary distribution * STORM-760: Use JSON for serialized conf * STORM-833: Logging framework logback - log4j 2.x
[2/4] storm git commit: Shading Jetty
Shading Jetty Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6168ae4e Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6168ae4e Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6168ae4e Branch: refs/heads/master Commit: 6168ae4e9ccf2301df8ce742ab4455a8713df4f0 Parents: 9ecf26c Author: Kishor Patil kpa...@yahoo-inc.com Authored: Thu Jun 4 21:21:30 2015 + Committer: Kishor Patil kpa...@yahoo-inc.com Committed: Thu Jun 4 21:21:30 2015 + -- storm-core/pom.xml | 5 + storm-dist/binary/src/main/assembly/binary.xml | 1 + 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/6168ae4e/storm-core/pom.xml -- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 69c2f0e..c43c6b2 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -424,6 +424,7 @@ includeorg.clojure:tools.cli/include includeorg.clojure:tools.macro/include includejoda-time:joda-time/include +includeorg.eclipse.jetty:*/include /includes /artifactSet @@ -564,6 +565,10 @@ patternorg.joda.time/pattern shadedPatternorg.apache.storm.joda.time/shadedPattern /relocation +relocation + patternorg.eclipse.jetty/pattern + shadedPatternorg.apache.storm.jetty/shadedPattern +/relocation /relocations transformers transformer implementation=org.apache.storm.maven.shade.clojure.ClojureTransformer / http://git-wip-us.apache.org/repos/asf/storm/blob/6168ae4e/storm-dist/binary/src/main/assembly/binary.xml -- diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml index a435312..3662424 100644 --- a/storm-dist/binary/src/main/assembly/binary.xml +++ b/storm-dist/binary/src/main/assembly/binary.xml @@ -58,6 +58,7 @@ excludeorg.clojure:tools.cli/exclude excludeorg.clojure:tools.macro/exclude excludejoda-time:joda-time/exclude +excludeorg.eclipse.jetty:*/exclude /excludes /dependencySet /dependencySets
storm git commit: Added STORM-849 to Changelog
Repository: storm Updated Branches: refs/heads/0.10.x-branch c75641654 - 266f9b1a4 Added STORM-849 to Changelog Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/266f9b1a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/266f9b1a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/266f9b1a Branch: refs/heads/0.10.x-branch Commit: 266f9b1a40f6efde652fbfcec4e0500643050edc Parents: c756416 Author: Robert (Bobby) Evans ev...@yahoo-inc.com Authored: Fri Jun 5 10:47:01 2015 -0500 Committer: Robert (Bobby) Evans ev...@yahoo-inc.com Committed: Fri Jun 5 10:47:01 2015 -0500 -- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/266f9b1a/CHANGELOG.md -- diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ad788c..8d72590 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## 0.10.0 + * STORM-849: Add storm-redis to storm binary distribution * STORM-760: Use JSON for serialized conf * STORM-833: Logging framework logback - log4j 2.x * STORM-842: Drop Support for Java 1.6
[3/4] storm git commit: Merge branch 'STORM-848' of https://github.com/kishorvpatil/incubator-storm into STORM-848
Merge branch 'STORM-848' of https://github.com/kishorvpatil/incubator-storm into STORM-848 STORM-848: Shade external dependencies Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/992603a6 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/992603a6 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/992603a6 Branch: refs/heads/master Commit: 992603a651dc4c55f91ebec5cd1aecc2ec09de60 Parents: 4a523ad 6168ae4 Author: Robert (Bobby) Evans ev...@yahoo-inc.com Authored: Fri Jun 5 11:03:22 2015 -0500 Committer: Robert (Bobby) Evans ev...@yahoo-inc.com Committed: Fri Jun 5 11:03:22 2015 -0500 -- external/flux/flux-core/pom.xml| 4 + external/storm-hdfs/pom.xml| 4 + external/storm-jdbc/pom.xml| 4 + external/storm-kafka/pom.xml | 8 + pom.xml| 18 +- storm-core/pom.xml | 226 +++- storm-dist/binary/src/main/assembly/binary.xml | 30 +++ 7 files changed, 272 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/992603a6/pom.xml -- http://git-wip-us.apache.org/repos/asf/storm/blob/992603a6/storm-core/pom.xml -- diff --cc storm-core/pom.xml index 18992f2,c43c6b2..096643e --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@@ -198,18 -199,11 +199,19 @@@ dependency groupIdcom.google.guava/groupId artifactIdguava/artifactId + scopecompile/scope /dependency dependency -groupIdch.qos.logback/groupId -artifactIdlogback-classic/artifactId +groupIdorg.apache.logging.log4j/groupId +artifactIdlog4j-api/artifactId +/dependency +dependency +groupIdorg.apache.logging.log4j/groupId +artifactIdlog4j-core/artifactId +/dependency +dependency +groupIdorg.apache.logging.log4j/groupId +artifactIdlog4j-slf4j-impl/artifactId /dependency dependency groupIdorg.slf4j/groupId http://git-wip-us.apache.org/repos/asf/storm/blob/992603a6/storm-dist/binary/src/main/assembly/binary.xml --
