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/01/02 21:44:23 UTC
[1/2] storm git commit: STORM-2856: Make Storm build work on
post-2017Q4 Travis Trusty image
Repository: storm
Updated Branches:
refs/heads/master 2846417c8 -> d644e29a8
STORM-2856: Make Storm build work on post-2017Q4 Travis Trusty image
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/af6b7f30
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/af6b7f30
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/af6b7f30
Branch: refs/heads/master
Commit: af6b7f30241db17584184c359ac24dbd555f8c59
Parents: a894fe6
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Wed Dec 13 16:47:31 2017 +0100
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Fri Dec 29 19:19:54 2017 +0100
----------------------------------------------------------------------
.travis.yml | 10 +++++-----
DEVELOPER.md | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/af6b7f30/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 89df2f8..e54bdd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,15 +22,15 @@ env:
dist: trusty
sudo: required
-group: deprecated-2017Q4
language: java
jdk:
- oraclejdk8
before_install:
- - rvm use 2.1.5 --install
- - nvm install 0.12.2
- - nvm use 0.12.2
+ - rvm reload
+ - rvm use 2.4.2 --install
+ - nvm install 8.9.3
+ - nvm use 8.9.3
install: /bin/bash ./dev-tools/travis/travis-install.sh `pwd`
script:
- /bin/bash ./dev-tools/travis/travis-script.sh `pwd` $MODULES
@@ -38,4 +38,4 @@ cache:
directories:
- "$HOME/.m2/repository"
- "$HOME/.rvm"
- - "$NVM_DIR"
+ - "$NVM_DIR"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/af6b7f30/DEVELOPER.md
----------------------------------------------------------------------
diff --git a/DEVELOPER.md b/DEVELOPER.md
index d1cad5c..24e6836 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -239,19 +239,19 @@ To pull in a merge request you should generally follow the command line instruct
# Build the code and run the tests
## Prerequisites
-Firt of all you need to make sure you are using maven 3.2.5 or below. There is a bug in later versions of maven as linked to from https://issues.apache.org/jira/browse/MSHADE-206 that
+First of all you need to make sure you are using maven 3.2.5 or below. There is a bug in later versions of maven as linked to from https://issues.apache.org/jira/browse/MSHADE-206 that
cause shaded dependencies to not be packaged correctly. Also please be aware that because we are shading dependencies mvn dependency:tree will not always show the dependencies correctly.
-In order to build `storm` you need `python`, `ruby` and `nodejs`. In order to avoid an overful page we don't provide platform/OS specific installation instructions for those here. Please refer to you platform's/OS' documentation for support.
+In order to build `storm` you need `python`, `ruby` and `nodejs`. In order to avoid an overfull page we don't provide platform/OS specific installation instructions for those here. Please refer to you platform's/OS' documentation for support.
The `ruby` package manager `rvm` and `nodejs` package manager `nvm` are for convenience and are used in the tests which run on [travis](https://travis-ci.org/apache/storm). They can be installed using `curl -L https://get.rvm.io | bash -s stable --autolibs=enabled && source ~/.profile` (see the [rvm installation instructions](https://github.com/rvm/rvm) for details) and `wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.26.1/install.sh | bash && source ~/.bashrc` (see the [nvm installation instructions](https://github.com/creationix/nvm) for details).
With `rvm` and `nvm` installed you can run
```sh
-rvm use 2.1.5 --install
-nvm install 0.12.2
-nvm use 0.12.2
+rvm use 2.4.2 --install
+nvm install 8.9.3
+nvm use 8.9.3
```
in order to get started as fast as possible. Users can still install a specific version of `ruby` and/or `node` manually.
[2/2] storm git commit: Merge branch 'STORM-2856' of
https://github.com/srdo/storm into STORM-2856
Posted by bo...@apache.org.
Merge branch 'STORM-2856' of https://github.com/srdo/storm into STORM-2856
STORM-2856: Make Storm build work on post-2017Q4 Travis Trusty image
This closes #2486
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d644e29a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d644e29a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d644e29a
Branch: refs/heads/master
Commit: d644e29a8808dd6cc619230f884d9be43a1e7509
Parents: 2846417 af6b7f3
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Tue Jan 2 15:43:35 2018 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Tue Jan 2 15:43:35 2018 -0600
----------------------------------------------------------------------
.travis.yml | 10 +++++-----
DEVELOPER.md | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------