You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/06/07 15:54:44 UTC
[08/50] [abbrv] storm git commit: STORM-2882: Addressed review
comments
STORM-2882: Addressed review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/71b61d9b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/71b61d9b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/71b61d9b
Branch: refs/heads/master
Commit: 71b61d9b2728026c848e9aa45e23a3dfae041f9a
Parents: e584c61
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jun 4 10:49:01 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jun 6 15:43:13 2018 -0500
----------------------------------------------------------------------
DEVELOPER.md | 4 ++--
examples/storm-loadgen/pom.xml | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/71b61d9b/DEVELOPER.md
----------------------------------------------------------------------
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 93541e8..1ae0ea6 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -239,8 +239,8 @@ To pull in a merge request you should generally follow the command line instruct
# Build the code and run the tests
## Prerequisites
-To work around a conflict between the shade plugin and maven https://issues.apache.org/jira/browse/MSHADE-206 the build is spit into 2 parts.
-First a set of dependencies are shaded and installed by running.
+To work around a conflict between the shade plugin and maven https://issues.apache.org/jira/browse/MSHADE-206, a set of
+dependencies needs to be shaded and installed by running:
```sh
cd shaded-deps
http://git-wip-us.apache.org/repos/asf/storm/blob/71b61d9b/examples/storm-loadgen/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-loadgen/pom.xml b/examples/storm-loadgen/pom.xml
index b566848..68478b5 100644
--- a/examples/storm-loadgen/pom.xml
+++ b/examples/storm-loadgen/pom.xml
@@ -71,18 +71,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>