Github user revans2 commented on a diff in the pull request:
https://github.com/apache/storm/pull/736#discussion_r39639639
--- Diff: storm-core/pom.xml ---
@@ -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. -->
--- End diff --
I left it the same because it is a different level of compatibility. This
change just requires a recompile and explicitly calling out dependencies. If I
change the package that changes some APIs that we expose because we expose a
TException in a few places. That is why I didn't shade disruptor or kryo
because both of them have pluggable interfaces exposed through configs, so I
didn't want to touch anything that was directly exposed to the end user. If we
want to make the change we can, but I would like to see a separate JIRA for
that. This is to fix the builds so shading is working properly.
---
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.
---
