Adressed review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ffa73f87 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ffa73f87 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ffa73f87 Branch: refs/heads/PR_736 Commit: ffa73f87c04844219d3c172e23f830e066261017 Parents: 2e0597b Author: Robert (Bobby) Evans <ev...@yahoo-inc.com> Authored: Wed Sep 16 10:58:29 2015 -0500 Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com> Committed: Wed Sep 16 10:58:29 2015 -0500 ---------------------------------------------------------------------- dev-tools/travis/travis-install.sh | 2 -- dev-tools/travis/travis-script.sh | 2 +- storm-core/pom.xml | 8 +++++++- 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ffa73f87/dev-tools/travis/travis-install.sh ---------------------------------------------------------------------- diff --git a/dev-tools/travis/travis-install.sh b/dev-tools/travis/travis-install.sh index 4988aba..d600bf8 100755 --- a/dev-tools/travis/travis-install.sh +++ b/dev-tools/travis/travis-install.sh @@ -35,8 +35,6 @@ then exit ${BUILD_RET_VAL} fi -exit ${BUILD_RET_VAL} - python ${TRAVIS_SCRIPT_DIR}/save-logs.py "install-storm-more.txt" mvn clean install -DskipTests -Pstorm-more BUILD_RET_VAL=$? http://git-wip-us.apache.org/repos/asf/storm/blob/ffa73f87/dev-tools/travis/travis-script.sh ---------------------------------------------------------------------- diff --git a/dev-tools/travis/travis-script.sh b/dev-tools/travis/travis-script.sh index be698bd..e349d6f 100755 --- a/dev-tools/travis/travis-script.sh +++ b/dev-tools/travis/travis-script.sh @@ -31,7 +31,7 @@ cd ${STORM_SRC_ROOT_DIR} export STORM_TEST_TIMEOUT_MS=100000 # We now lean on Travis CI's implicit behavior, ```mvn clean install -DskipTests``` before running script -mvn test -fae -Pnative -Pstorm-core && mvn test -fae -Pnative -Pstorm-more +mvn test -fae -Pnative -Pstorm-core && mvn test -fae -Pstorm-more BUILD_RET_VAL=$? for dir in `find . -type d -and -wholename \*/target/\*-reports`; http://git-wip-us.apache.org/repos/asf/storm/blob/ffa73f87/storm-core/pom.xml ---------------------------------------------------------------------- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index ca40cb8..8d0608e 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -495,7 +495,7 @@ </relocation> <relocation> <pattern>org.apache.thrift</pattern> - <!-- This pattern is inconsistent for backwards compatability purposes. --> + <!-- This pattern is inconsistent for backwards compatibility purposes. --> <shadedPattern>org.apache.thrift7</shadedPattern> </relocation> <relocation> @@ -607,6 +607,12 @@ <transformer implementation="org.apache.storm.maven.shade.clojure.ClojureTransformer" /> </transformers> <filters> + <!-- Several of these filters remove the .clj files from the shaded dependencies, even though only .clj files are in these jars. + The reason for this is a bit complex, but intentional. Durring the build process all of the dependency .clj files are + compiled down into .class files, and included in storm-core.jar. The regular shade thransformer handles these in + the majority of cases correctly. However, the ClojureTransformer does not shade everything correctly all the + time. Instead of spending a lot of time to get the ClojureTransformer to parse clojrue correctly we opted to remove + the .clj files from the uber jar. --> <filter><artifact>org.clojure:core.incubator</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> <filter><artifact>cheshire:cheshire</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> <filter><artifact>org.clojure:tools.logging</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter>