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 <[email protected]> Authored: Thu Jun 4 14:35:49 2015 +0000 Committer: Kishor Patil <[email protected]> Committed: Thu Jun 4 16:52:49 2015 +0000 ---------------------------------------------------------------------- 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> <scope>test</scope> </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</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> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>2.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 @@ <version>2.3.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-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> <scope>provided</scope> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-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.version>0.2.3</clojure.tools.nrepl.version> <clojure-complete.version>0.2.3</clojure-complete.version> <mockito.version>1.9.5</mockito.version> - <reply.version>0.3.0</reply.version> <conjure.version>2.1.3</conjure.version> <zookeeper.version>3.4.6</zookeeper.version> <clojure-data-codec.version>0.1.0</clojure-data-codec.version> <clojure-contrib.version>1.2.0</clojure-contrib.version> <hive.version>0.14.0</hive.version> <hadoop.version>2.6.0</hadoop.version> + <kryo.version>2.21</kryo.version> </properties> <profiles> @@ -322,6 +322,11 @@ <version>${clojure.version}</version> </dependency> <dependency> + <groupId>com.esotericsoftware.kryo</groupId> + <artifactId>kryo</artifactId> + <version>${kryo.version}</version> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>${commons-io.version}</version> @@ -545,17 +550,6 @@ </dependencies> </dependencyManagement> - - <dependencies> - <!-- reply dependency adds leiningen-style REPL --> - <dependency> - <groupId>reply</groupId> - <artifactId>reply</artifactId> - <version>${reply.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - <repositories> <repository> <releases> http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/storm-core/pom.xml ---------------------------------------------------------------------- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 765a1dd..69c2f0e 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -35,11 +35,9 @@ </properties> <dependencies> - <!-- multi-lang resources --> <dependency> - <groupId>org.apache.storm</groupId> - <artifactId>multilang-ruby</artifactId> - <version>${project.version}</version> + <groupId>com.esotericsoftware.kryo</groupId> + <artifactId>kryo</artifactId> </dependency> <!--clojure--> <dependency> @@ -127,14 +125,17 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.thrift</groupId> @@ -157,6 +158,7 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> + <scope>compile</scope> <exclusions> <exclusion> <groupId>log4j</groupId> @@ -171,33 +173,33 @@ <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>com.twitter</groupId> <artifactId>carbonite</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> + <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - - <dependency> <groupId>com.googlecode.disruptor</groupId> <artifactId>disruptor</artifactId> </dependency> <dependency> <groupId>org.jgrapht</groupId> <artifactId>jgrapht-core</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -390,7 +392,7 @@ </executions> <configuration> <keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope> - <promoteTransitiveDependencies>true</promoteTransitiveDependencies> + <promoteTransitiveDependencies>false</promoteTransitiveDependencies> <createDependencyReducedPom>true</createDependencyReducedPom> <minimizeJar>false</minimizeJar> <artifactSet> @@ -401,6 +403,27 @@ <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> + <include>commons-fileupload:commons-fileupload</include> + <include>commons-lang:commons-lang</include> + <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.macro</include> + <include>joda-time:joda-time</include> </includes> </artifactSet> @@ -433,6 +456,114 @@ <pattern>org.apache.curator</pattern> <shadedPattern>org.apache.storm.curator</shadedPattern> </relocation> + <relocation> + <pattern>org.jboss.netty</pattern> + <shadedPattern>org.apache.storm.netty</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.common</pattern> + <shadedPattern>org.apache.storm.guava</shadedPattern> + </relocation> + <relocation> + <pattern>com.google.thirdparty</pattern> + <shadedPattern>org.apache.storm.guava.thirdparty</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.http</pattern> + <shadedPattern>org.apache.storm.http</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.zookeeper</pattern> + <shadedPattern>org.apache.storm.zookeeper</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.jute</pattern> + <shadedPattern>org.apache.storm.jute</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.curator</pattern> + <shadedPattern>org.apache.storm.curator</shadedPattern> + </relocation> + <relocation> + <pattern>carbonite</pattern> + <shadedPattern>org.apache.storm.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> + </relocation> + <relocation> + <pattern>org.tukaani.xz</pattern> + <shadedPattern>org.apache.storm.xz</shadedPattern> + </relocation> + <relocation> + <pattern>org.yaml.snakeyaml</pattern> + <shadedPattern>org.apache.storm.snakeyaml</shadedPattern> + </relocation> + <relocation> + <pattern>org.jgrapht</pattern> + <shadedPattern>org.apache.storm.jgrapht</shadedPattern> + </relocation> + <relocation> + <pattern>org.fusesource</pattern> + <shadedPattern>org.apache.storm.fusesource</shadedPattern> + </relocation> + <relocation> + <pattern>com.metamx.http.client</pattern> + <shadedPattern>org.apache.storm.metamx.http.client</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.io</pattern> + <shadedPattern>org.apache.storm.commons.io</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.codec</pattern> + <shadedPattern>org.apache.storm.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> + </relocation> + <relocation> + <pattern>org.apache.commons.exec</pattern> + <shadedPattern>org.apache.storm.commons.exec</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.lang</pattern> + <shadedPattern>org.apache.storm.commons.lang</shadedPattern> + </relocation> + <relocation> + <pattern>org.json.simple</pattern> + <shadedPattern>org.apache.storm.json.simple</shadedPattern> + </relocation> + <relocation> + <pattern>clojure.math</pattern> + <shadedPattern>org.apache.storm.clojure.math</shadedPattern> + </relocation> + <relocation> + <pattern>clojure.tools.cli</pattern> + <shadedPattern>org.apache.storm.clojure.tools.cli</shadedPattern> + </relocation> + <relocation> + <pattern>cljs.tools.cli</pattern> + <shadedPattern>org.apache.storm.cljs.tools.cli</shadedPattern> + </relocation> + <relocation> + <pattern>clojure.tools.macro</pattern> + <shadedPattern>org.apache.storm.clojure.tools.macro</shadedPattern> + </relocation> + <relocation> + <pattern>org.joda.time</pattern> + <shadedPattern>org.apache.storm.joda.time</shadedPattern> + </relocation> </relocations> <transformers> <transformer implementation="org.apache.storm.maven.shade.clojure.ClojureTransformer" /> @@ -466,6 +597,76 @@ <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> + <exclude>META-INF/NOTICE.txt</exclude> + </excludes> + </filter> + <filter> + <artifact>commons-io:commons-io</artifact> + <excludes> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + </excludes> + </filter> + <filter> + <artifact>commons-codec:commons-codec</artifact> + <excludes> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + </excludes> + </filter> + <filter> + <artifact>commons-fileupload:commons-fileupload</artifact> + <excludes> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + </excludes> + </filter> + <filter> + <artifact>commons-lang:commons-lang</artifact> + <excludes> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + </excludes> + </filter> + <filter> + <artifact>joda-time:joda-time</artifact> + <excludes> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + </excludes> + </filter> </filters> </configuration> <dependencies> http://git-wip-us.apache.org/repos/asf/storm/blob/9ecf26cf/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 31d8b9e..a435312 100644 --- a/storm-dist/binary/src/main/assembly/binary.xml +++ b/storm-dist/binary/src/main/assembly/binary.xml @@ -30,6 +30,35 @@ <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> + </excludes> </dependencySet> </dependencySets>
