Github user erikdw commented on a diff in the pull request:
https://github.com/apache/storm/pull/736#discussion_r39771292
--- Diff: storm-core/pom.xml ---
@@ -385,168 +427,205 @@
<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 compatibility 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>
+ <!-- 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
--- End diff --
typo: thransformer
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
