Repository: storm Updated Branches: refs/heads/PR_736 [created] 5682c9602
Shaded everything that was not already shaded, and cleaned up build so the dependency-reduced pom.xml is used correctly. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2e0597b1 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2e0597b1 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2e0597b1 Branch: refs/heads/PR_736 Commit: 2e0597b16cd431290fed065463997d8e5412bc84 Parents: 8eb4509 Author: Robert (Bobby) Evans <ev...@yahoo-inc.com> Authored: Fri Sep 11 11:56:34 2015 -0500 Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com> Committed: Tue Sep 15 14:28:31 2015 -0500 ---------------------------------------------------------------------- DEVELOPER.md | 42 ++-- dev-tools/travis/travis-install.sh | 15 +- dev-tools/travis/travis-script.sh | 2 +- external/storm-elasticsearch/pom.xml | 5 + external/storm-kafka/pom.xml | 5 + external/storm-solr/pom.xml | 4 +- pom.xml | 135 ++++++++--- storm-core/pom.xml | 253 +++++++++++--------- storm-core/src/clj/backtype/storm/log.clj | 2 +- storm-dist/binary/src/main/assembly/binary.xml | 32 --- 10 files changed, 293 insertions(+), 202 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/DEVELOPER.md ---------------------------------------------------------------------- diff --git a/DEVELOPER.md b/DEVELOPER.md index 3634f11..571ec01 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -222,19 +222,21 @@ To pull in a merge request you should generally follow the command line instruct # Build the code and run the tests -The following commands must be run from the top-level directory. +Storm has some oddities with packaging and plugin dependencies. We build our own plugins and shade storm-core, +but have sub-modules that depend on storm-core. Because of this the build needs to be split into two parts. +You can still build in a single step, but the resulting packages may not be completely correct, or you might get +compilation or test errors with missing classes, etc. - # Build the code and run the tests (requires nodejs, python and ruby installed) - # `mvn clean package` will fail because storm-core requires storm-maven-plugin. - # This plugin should be installed before compiling storm-core. - $ mvn clean install +The first step is to build/install the plugins and storm-core - # Build the code and run the tests, with specifying default test timeout (in millisecond) - $ export STORM_TEST_TIMEOUT_MS=10000 - $ mvn clean install +`mvn clean install -Pstorm-core` - # Build the code but skip the tests - $ mvn clean install -DskipTests=true +If you wish to skip the unit tests you can do this by adding `-DskipTests` to the command line. Once this +completes successfully you may run + +`mvn clean install -Pstorm-more` + +to build and test all of the external libraries and examples. Again if you want to include `-DskipTests` you can. In case you modified `storm.thrift`, you have to regenerate thrift code as java and python code before compiling whole project. @@ -243,23 +245,8 @@ cd storm-core/src sh genthrift.sh ``` -You can also run tests selectively via the Clojure REPL. The following example runs the tests in -[auth_test.clj](storm-core/test/clj/backtype/storm/security/auth/auth_test.clj), which has the namespace -`backtype.storm.security.auth.auth-test`. - -First, start the REPL from within the relevant sub-project (here: `storm-core`): +You can also run tests selectively with `-Dtest=<test_name>`. This works for both clojure and junit tests. - $ cd storm-core/ - $ mvn clojure:repl - -Now we run the tests in `auth_test.clj` in the REPL: - -```clojure -;; You can use both absolute as well as relative paths to the .clj file. -(load-file "test/clj/backtype/storm/security/auth/auth_test.clj") -(ns backtype.storm.security.auth.auth-test) -(run-tests) -``` > Tip: IDEs such as IntelliJ IDEA support a built-in Clojure REPL, which you > can also use to run tests selectively. > Sometimes you may find that tests pass/fail depending on which REPL you use, > which -- although frustrating -- @@ -274,7 +261,8 @@ You can create a _distribution_ (like what you can download from Apache) as foll do not use the Maven release plugin because creating an official release is the task of our release manager. # First, build the code. - $ mvn clean install # you may skip tests with `-DskipTests=true` to save time + $ mvn clean install -Pstorm-core # you may skip tests with `-DskipTests=true` to save time + $ mvn clean install -Pstorm-more # you may skip tests with `-DskipTests=true` to save time # Create the binary distribution. $ cd storm-dist/binary && mvn package http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/dev-tools/travis/travis-install.sh ---------------------------------------------------------------------- diff --git a/dev-tools/travis/travis-install.sh b/dev-tools/travis/travis-install.sh index 2812240..4988aba 100755 --- a/dev-tools/travis/travis-install.sh +++ b/dev-tools/travis/travis-install.sh @@ -26,12 +26,23 @@ TRAVIS_SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) cd ${STORM_SRC_ROOT_DIR} -python ${TRAVIS_SCRIPT_DIR}/save-logs.py "install.txt" mvn clean install -DskipTests -Pnative +python ${TRAVIS_SCRIPT_DIR}/save-logs.py "install-storm-core.txt" mvn clean install -DskipTests -Pnative -Pstorm-core BUILD_RET_VAL=$? if [[ "$BUILD_RET_VAL" != "0" ]]; then - cat "install.txt" + cat "install-storm-core.txt" + 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=$? + +if [[ "$BUILD_RET_VAL" != "0" ]]; +then + cat "install-storm-more.txt" fi exit ${BUILD_RET_VAL} http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/dev-tools/travis/travis-script.sh ---------------------------------------------------------------------- diff --git a/dev-tools/travis/travis-script.sh b/dev-tools/travis/travis-script.sh index 77b9fb6..be698bd 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 +mvn test -fae -Pnative -Pstorm-core && mvn test -fae -Pnative -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/2e0597b1/external/storm-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-elasticsearch/pom.xml b/external/storm-elasticsearch/pom.xml index 7777549..fd263e6 100644 --- a/external/storm-elasticsearch/pom.xml +++ b/external/storm-elasticsearch/pom.xml @@ -41,6 +41,11 @@ <dependencies> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/external/storm-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml index c731a0f..8f2867b 100644 --- a/external/storm-kafka/pom.xml +++ b/external/storm-kafka/pom.xml @@ -57,6 +57,11 @@ </build> <dependencies> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>1.9.0</version> http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/external/storm-solr/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-solr/pom.xml b/external/storm-solr/pom.xml index 2b5c742..5e7caa4 100644 --- a/external/storm-solr/pom.xml +++ b/external/storm-solr/pom.xml @@ -21,7 +21,7 @@ </developers> <dependencies> - <dependency> + <dependency> <groupId>org.apache.storm</groupId> <artifactId>storm-core</artifactId> <version>${project.version}</version> @@ -95,4 +95,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9c86ad4..c0ca37e 100644 --- a/pom.xml +++ b/pom.xml @@ -154,26 +154,6 @@ <maven>3.0.0</maven> </prerequisites> - <modules> - <module>storm-buildtools/maven-shade-clojure-transformer</module> - <module>storm-buildtools/storm-maven-plugins</module> - <module>storm-multilang/javascript</module> - <module>storm-multilang/python</module> - <module>storm-multilang/ruby</module> - <module>storm-core</module> - <module>external/storm-kafka</module> - <module>external/storm-hdfs</module> - <module>external/storm-hbase</module> - <module>external/storm-hive</module> - <module>external/storm-jdbc</module> - <module>external/storm-redis</module> - <module>external/storm-eventhubs</module> - <module>external/flux</module> - <module>external/storm-elasticsearch</module> - <module>external/storm-solr</module> - <module>examples/storm-starter</module> - </modules> - <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> @@ -197,10 +177,13 @@ <commons-io.version>2.4</commons-io.version> <commons-lang.version>2.5</commons-lang.version> <commons-exec.version>1.1</commons-exec.version> + <commons-fileupload.version>1.2.1</commons-fileupload.version> + <commons-codec.version>1.6</commons-codec.version> <clj-time.version>0.8.0</clj-time.version> <curator.version>2.5.0</curator.version> <json-simple.version>1.1</json-simple.version> <ring.version>1.3.0</ring.version> + <ring-json.version>0.3.1</ring-json.version> <jetty.version>7.6.13.v20130916</jetty.version> <clojure.tools.logging.version>0.2.3</clojure.tools.logging.version> <clojure.math.numeric-tower.version>0.0.1</clojure.math.numeric-tower.version> @@ -214,6 +197,7 @@ <netty.version>3.9.0.Final</netty.version> <log4j-over-slf4j.version>1.6.6</log4j-over-slf4j.version> <log4j.version>2.1</log4j.version> + <slf4j.version>1.7.7</slf4j.version> <clojure.tools.nrepl.version>0.2.3</clojure.tools.nrepl.version> <clojure-complete.version>0.2.3</clojure-complete.version> <mockito.version>1.9.5</mockito.version> @@ -224,10 +208,48 @@ <hive.version>0.14.0</hive.version> <hadoop.version>2.6.0</hadoop.version> <kryo.version>2.21</kryo.version> + <servlet.version>2.5</servlet.version> + <joda-time.version>2.3</joda-time.version> + <jackson.version>2.3.1</jackson.version> + <thrift.version>0.9.2</thrift.version> + <junit.version>4.11</junit.version> </properties> <profiles> <profile> + <id>storm-core</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>storm-multilang/javascript</module> + <module>storm-multilang/python</module> + <module>storm-multilang/ruby</module> + <module>storm-buildtools/maven-shade-clojure-transformer</module> + <module>storm-buildtools/storm-maven-plugins</module> + <module>storm-core</module> + </modules> + </profile> + <profile> + <id>storm-more</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>external/storm-kafka</module> + <module>external/storm-hdfs</module> + <module>external/storm-hbase</module> + <module>external/storm-hive</module> + <module>external/storm-jdbc</module> + <module>external/storm-redis</module> + <module>external/storm-eventhubs</module> + <module>external/flux</module> + <module>external/storm-elasticsearch</module> + <module>external/storm-solr</module> + <module>examples/storm-starter</module> + </modules> + </profile> + <profile> <id>sign</id> <build> <plugins> @@ -380,6 +402,41 @@ </exclusions> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servlet.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>${joda-time.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-smile</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>${commons-fileupload.version}</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons-codec.version}</version> + </dependency> + <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> <version>${curator.version}</version> @@ -409,6 +466,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + <version>${curator.version}</version> + </dependency> <dependency> <groupId>com.googlecode.json-simple</groupId> @@ -436,6 +498,11 @@ <version>${ring.version}</version> </dependency> <dependency> + <groupId>ring</groupId> + <artifactId>ring-json</artifactId> + <version>${ring-json.version}</version> + </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> <version>${jetty.version}</version> @@ -446,6 +513,17 @@ <version>${jetty.version}</version> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + + <dependency> <groupId>org.clojure</groupId> <artifactId>tools.logging</artifactId> <version>${clojure.tools.logging.version}</version> @@ -570,16 +648,15 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.9.2</version> + <version>${thrift.version}</version> <scope>compile</scope> </dependency> - <!-- used by examples/storm-starter --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> @@ -673,7 +750,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.2</version> + <version>2.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/storm-core/pom.xml ---------------------------------------------------------------------- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 3eb4112..ca40cb8 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -39,6 +39,12 @@ <dependency> <groupId>com.esotericsoftware.kryo</groupId> <artifactId>kryo</artifactId> + <exclusions> + <exclusion> + <groupId>org.objenesis</groupId> + <artifactId>objenesis</artifactId> + </exclusion> + </exclusions> </dependency> <!--clojure--> <dependency> @@ -74,7 +80,6 @@ <dependency> <groupId>ring</groupId> <artifactId>ring-json</artifactId> - <version>0.3.1</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -141,7 +146,6 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.9.2</version> <scope>compile</scope> <exclusions> <exclusion> @@ -154,8 +158,6 @@ </exclusion> </exclusions> </dependency> - - <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> @@ -192,8 +194,6 @@ <artifactId>json-simple</artifactId> <scope>compile</scope> </dependency> - - <dependency> <groupId>com.twitter</groupId> <artifactId>carbonite</artifactId> @@ -244,10 +244,53 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-smile</artifactId> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> </dependency> </dependencies> <build> @@ -360,23 +403,22 @@ <minimizeJar>false</minimizeJar> <artifactSet> <includes> + <include>ns-tracker:ns-tracker</include> + <include>hiccup:hiccup</include> + <include>ring:*</include> + <include>compojure:compojure</include> + <include>clj-time:clj-time</include> <include>org.apache.thrift:*</include> <include>io.netty:netty</include> <include>com.google.guava:guava</include> <include>org.apache.httpcomponents:http*</include> <include>org.apache.zookeeper:zookeeper</include> <include>org.apache.curator:*</include> - <include>org.apache.httpcomponents:http*</include> - <include>org.apache.zookeeper:zookeeper</include> - <include>org.apache.curator:*</include> <include>com.twitter:carbonite</include> <include>com.twitter:chill-java</include> - <include>org.objenesis:objenesis</include> <include>org.tukaani:xz</include> <include>org.yaml:snakeyaml</include> <include>org.jgrapht:jgrapht-core</include> - <include>commons-httpclient:commons-httpclient</include> - <include>org.apache.commons:commons-compress</include> <include>org.apache.commons:commons-exec</include> <include>commons-io:commons-io</include> <include>commons-codec:commons-codec</include> @@ -385,168 +427,199 @@ <include>com.googlecode.json-simple:json-simple</include> <include>org.clojure:math.numeric-tower</include> <include>org.clojure:tools.cli</include> + <include>org.clojure:tools.logging</include> <include>org.clojure:tools.macro</include> + <include>org.clojure:java.jmx</include> <include>joda-time:joda-time</include> <include>org.eclipse.jetty:*</include> <include>com.fasterxml.jackson.core:*</include> <include>com.fasterxml.jackson.dataformat:*</include> + <include>clout:clout</include> + <include>org.clojure:tools.namespace</include> + <include>cheshire:cheshire</include> + <include>org.clojure:core.incubator</include> </includes> </artifactSet> - <relocations> <relocation> - <pattern>com.fasterxml.jackson.core</pattern> - <shadedPattern>com.fasterxml.jackson.storm.core</shadedPattern> + <pattern>cheshire</pattern> + <shadedPattern>org.apache.storm.shade.cheshire</shadedPattern> </relocation> <relocation> - <pattern>com.fasterxml.jackson.dataformat</pattern> - <shadedPattern>com.fasterxml.jackson.storm.dataformat</shadedPattern> + <pattern>clojure.tools.logging</pattern> + <shadedPattern>org.apache.storm.shade.clojure.tools.logging</shadedPattern> </relocation> <relocation> - <pattern>org.apache.thrift</pattern> - <shadedPattern>org.apache.thrift7</shadedPattern> + <pattern>clojure.core.incubator</pattern> + <shadedPattern>org.apache.storm.shade.clojure.core.incubator</shadedPattern> </relocation> <relocation> - <pattern>org.jboss.netty</pattern> - <shadedPattern>org.apache.storm.netty</shadedPattern> + <pattern>clojure.tools.namespace</pattern> + <shadedPattern>org.apache.storm.shade.clojure.tools.namespace</shadedPattern> </relocation> <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>org.apache.storm.guava</shadedPattern> + <pattern>clout</pattern> + <shadedPattern>org.apache.storm.shade.clout</shadedPattern> </relocation> <relocation> - <pattern>com.google.thirdparty</pattern> - <shadedPattern>org.apache.storm.guava.thirdparty</shadedPattern> + <pattern>compojure</pattern> + <shadedPattern>org.apache.storm.shade.compojure</shadedPattern> </relocation> <relocation> - <pattern>org.apache.http</pattern> - <shadedPattern>org.apache.storm.http</shadedPattern> + <pattern>ns_tracker</pattern> + <shadedPattern>org.apache.storm.shade.ns_tracker</shadedPattern> </relocation> <relocation> - <pattern>org.apache.zookeeper</pattern> - <shadedPattern>org.apache.storm.zookeeper</shadedPattern> + <pattern>ns-tracker</pattern> + <shadedPattern>org.apache.storm.shade.ns-tracker</shadedPattern> </relocation> <relocation> - <pattern>org.apache.curator</pattern> - <shadedPattern>org.apache.storm.curator</shadedPattern> + <pattern>hiccup</pattern> + <shadedPattern>org.apache.storm.shade.hiccup</shadedPattern> + </relocation> + <relocation> + <pattern>ring</pattern> + <shadedPattern>org.apache.storm.shade.ring</shadedPattern> + </relocation> + <relocation> + <pattern>clj_time</pattern> + <shadedPattern>org.apache.storm.shade.clj_time</shadedPattern> + </relocation> + <relocation> + <pattern>clj-time</pattern> + <shadedPattern>org.apache.storm.shade.clj-time</shadedPattern> + </relocation> + <relocation> + <pattern>com.fasterxml</pattern> + <shadedPattern>org.apache.storm.shade.com.fasterxml</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.thrift</pattern> + <!-- This pattern is inconsistent for backwards compatability purposes. --> + <shadedPattern>org.apache.thrift7</shadedPattern> </relocation> <relocation> <pattern>org.jboss.netty</pattern> - <shadedPattern>org.apache.storm.netty</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.jboss.netty</shadedPattern> </relocation> <relocation> <pattern>com.google.common</pattern> - <shadedPattern>org.apache.storm.guava</shadedPattern> + <shadedPattern>org.apache.storm.shade.com.google.common</shadedPattern> </relocation> <relocation> <pattern>com.google.thirdparty</pattern> - <shadedPattern>org.apache.storm.guava.thirdparty</shadedPattern> + <shadedPattern>org.apache.storm.shade.com.google.thirdparty</shadedPattern> </relocation> <relocation> <pattern>org.apache.http</pattern> - <shadedPattern>org.apache.storm.http</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.apache.http</shadedPattern> </relocation> <relocation> - <pattern>org.apache.zookeeper</pattern> - <shadedPattern>org.apache.storm.zookeeper</shadedPattern> + <pattern>org.apache.curator</pattern> + <shadedPattern>org.apache.storm.shade.org.apache.curator</shadedPattern> </relocation> <relocation> - <pattern>org.apache.jute</pattern> - <shadedPattern>org.apache.storm.jute</shadedPattern> + <pattern>org.apache.zookeeper</pattern> + <shadedPattern>org.apache.storm.shade.org.apache.zookeeper</shadedPattern> </relocation> <relocation> - <pattern>org.apache.curator</pattern> - <shadedPattern>org.apache.storm.curator</shadedPattern> + <pattern>org.apache.jute</pattern> + <shadedPattern>org.apache.storm.shade.org.apache.jute</shadedPattern> </relocation> <relocation> <pattern>carbonite</pattern> - <shadedPattern>org.apache.storm.carbonite</shadedPattern> + <shadedPattern>org.apache.storm.shade.carbonite</shadedPattern> </relocation> <relocation> <pattern>com.twitter.chill</pattern> - <shadedPattern>org.apache.storm.chill</shadedPattern> - </relocation> - <relocation> - <pattern>org.objenesis</pattern> - <shadedPattern>org.apache.storm.objenesis</shadedPattern> + <shadedPattern>org.apache.storm.shade.com.twitter.chill</shadedPattern> </relocation> <relocation> <pattern>org.tukaani.xz</pattern> - <shadedPattern>org.apache.storm.xz</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.tukaani.xz</shadedPattern> </relocation> <relocation> <pattern>org.yaml.snakeyaml</pattern> - <shadedPattern>org.apache.storm.snakeyaml</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.yaml.snakeyaml</shadedPattern> </relocation> <relocation> <pattern>org.jgrapht</pattern> - <shadedPattern>org.apache.storm.jgrapht</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.jgrapht</shadedPattern> </relocation> <relocation> <pattern>org.fusesource</pattern> - <shadedPattern>org.apache.storm.fusesource</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.fusesource</shadedPattern> </relocation> <relocation> <pattern>com.metamx.http.client</pattern> - <shadedPattern>org.apache.storm.metamx.http.client</shadedPattern> + <shadedPattern>org.apache.storm.shade.com.metamx.http.client</shadedPattern> </relocation> <relocation> <pattern>org.apache.commons.io</pattern> - <shadedPattern>org.apache.storm.commons.io</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.apache.commons.io</shadedPattern> </relocation> <relocation> <pattern>org.apache.commons.codec</pattern> - <shadedPattern>org.apache.storm.commons.codec</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.apache.commons.codec</shadedPattern> </relocation> <relocation> <pattern>org.apache.commons.fileupload</pattern> - <shadedPattern>org.apache.storm.commons.fileupload</shadedPattern> - </relocation> - <relocation> - <pattern>org.apache.commons.compress</pattern> - <shadedPattern>org.apache.storm.commons.compress</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.apache.commons.fileupload</shadedPattern> </relocation> <relocation> <pattern>org.apache.commons.exec</pattern> - <shadedPattern>org.apache.storm.commons.exec</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.apache.commons.exec</shadedPattern> </relocation> <relocation> <pattern>org.apache.commons.lang</pattern> - <shadedPattern>org.apache.storm.commons.lang</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.apache.commons.lang</shadedPattern> </relocation> <relocation> <pattern>org.json.simple</pattern> - <shadedPattern>org.apache.storm.json.simple</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.json.simple</shadedPattern> </relocation> <relocation> <pattern>clojure.math</pattern> - <shadedPattern>org.apache.storm.clojure.math</shadedPattern> + <shadedPattern>org.apache.storm.shade.clojure.math</shadedPattern> </relocation> <relocation> <pattern>clojure.tools.cli</pattern> - <shadedPattern>org.apache.storm.clojure.tools.cli</shadedPattern> + <shadedPattern>org.apache.storm.shade.clojure.tools.cli</shadedPattern> </relocation> <relocation> <pattern>cljs.tools.cli</pattern> - <shadedPattern>org.apache.storm.cljs.tools.cli</shadedPattern> + <shadedPattern>org.apache.storm.shade.cljs.tools.cli</shadedPattern> </relocation> <relocation> <pattern>clojure.tools.macro</pattern> - <shadedPattern>org.apache.storm.clojure.tools.macro</shadedPattern> + <shadedPattern>org.apache.storm.shade.clojure.tools.macro</shadedPattern> </relocation> <relocation> <pattern>org.joda.time</pattern> - <shadedPattern>org.apache.storm.joda.time</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.joda.time</shadedPattern> </relocation> <relocation> <pattern>org.eclipse.jetty</pattern> - <shadedPattern>org.apache.storm.jetty</shadedPattern> + <shadedPattern>org.apache.storm.shade.org.eclipse.jetty</shadedPattern> </relocation> </relocations> <transformers> <transformer implementation="org.apache.storm.maven.shade.clojure.ClojureTransformer" /> </transformers> <filters> + <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> + <filter><artifact>org.clojure:tools.namespace</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> + <filter><artifact>org.clojure:math.numeric-tower</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> + <filter><artifact>org.clojure:tools.macro</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> + <filter><artifact>org.clojure:tools.cli</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> + <filter><artifact>ns-tracker:ns-tracker</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> + <filter><artifact>clout:clout</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> + <filter><artifact>hiccup:hiccup</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> + <filter><artifact>clj-time:clj-time</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> + <filter><artifact>ring:*</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> + <filter><artifact>compojure:compojure</artifact><excludes><exclude>**/*.clj</exclude></excludes></filter> <filter> <artifact>org.apache.thrift:*</artifact> <excludes> @@ -562,48 +635,12 @@ </excludes> </filter> <filter> - <artifact>commons-httpclient:commons-httpclient</artifact> - <excludes> - <exclude>META-INF/LICENSE.txt</exclude> - <exclude>META-INF/NOTICE.txt</exclude> - <exclude>META-INF/README.txt</exclude> - </excludes> - </filter> - <filter> <artifact>org.apache.zookeeper:zookeeper</artifact> <excludes> <exclude>LICENSE.txt</exclude> </excludes> </filter> <filter> - <artifact>commons-httpclient:commons-httpclient</artifact> - <excludes> - <exclude>META-INF/LICENSE.txt</exclude> - <exclude>META-INF/NOTICE.txt</exclude> - <exclude>META-INF/README.txt</exclude> - </excludes> - </filter> - <filter> - <artifact>org.apache.zookeeper:zookeeper</artifact> - <excludes> - <exclude>LICENSE.txt</exclude> - </excludes> - </filter> - <filter> - <artifact>org.objenesis:objenesis</artifact> - <excludes> - <exclude>META-INF/LICENSE.txt</exclude> - <exclude>META-INF/NOTICE.txt</exclude> - </excludes> - </filter> - <filter> - <artifact>org.apache.commons:commons-compress</artifact> - <excludes> - <exclude>META-INF/LICENSE.txt</exclude> - <exclude>META-INF/NOTICE.txt</exclude> - </excludes> - </filter> - <filter> <artifact>org.apache.commons:commons-exec</artifact> <excludes> <exclude>META-INF/LICENSE.txt</exclude> http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/storm-core/src/clj/backtype/storm/log.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/backtype/storm/log.clj b/storm-core/src/clj/backtype/storm/log.clj index 0fcf822..55b44fe 100644 --- a/storm-core/src/clj/backtype/storm/log.clj +++ b/storm-core/src/clj/backtype/storm/log.clj @@ -15,7 +15,7 @@ ;; limitations under the License. (ns backtype.storm.log - (:require [clojure.tools [logging :as log]])) + (:require [clojure.tools.logging :as log])) (defmacro log-message [& args] http://git-wip-us.apache.org/repos/asf/storm/blob/2e0597b1/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 9f6c8f7..4cd6911 100644 --- a/storm-dist/binary/src/main/assembly/binary.xml +++ b/storm-dist/binary/src/main/assembly/binary.xml @@ -30,38 +30,6 @@ <useProjectArtifact>false</useProjectArtifact> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> - <excludes> - <exclude>org.apache.thrift:*</exclude> - <exclude>io.netty:netty</exclude> - <exclude>com.google.guava:guava</exclude> - <exclude>org.apache.httpcomponents:http*</exclude> - <exclude>org.apache.zookeeper:zookeeper</exclude> - <exclude>org.apache.curator:*</exclude> - <exclude>org.apache.httpcomponents:http*</exclude> - <exclude>org.apache.zookeeper:zookeeper</exclude> - <exclude>org.apache.curator:*</exclude> - <exclude>com.twitter:carbonite</exclude> - <exclude>com.twitter:chill-java</exclude> - <exclude>org.objenesis:objenesis</exclude> - <exclude>org.tukaani:xz</exclude> - <exclude>org.yaml:snakeyaml</exclude> - <exclude>org.jgrapht:jgrapht-core</exclude> - <exclude>commons-httpclient:commons-httpclient</exclude> - <exclude>org.apache.commons:commons-compress</exclude> - <exclude>org.apache.commons:commons-exec</exclude> - <exclude>commons-io:commons-io</exclude> - <exclude>commons-codec:commons-codec</exclude> - <exclude>commons-fileupload:commons-fileupload</exclude> - <exclude>commons-lang:commons-lang</exclude> - <exclude>com.googlecode.json-simple:json-simple</exclude> - <exclude>org.clojure:math.numeric-tower</exclude> - <exclude>org.clojure:tools.cli</exclude> - <exclude>org.clojure:tools.macro</exclude> - <exclude>joda-time:joda-time</exclude> - <exclude>org.eclipse.jetty:*</exclude> - <exclude>com.fasterxml.jackson.core:*</exclude> - <exclude>com.fasterxml.jackson.dataformat:*</exclude> - </excludes> </dependencySet> </dependencySets>
