You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/06/05 18:38:14 UTC
[2/4] storm git commit: Shading Jetty
Shading Jetty
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6168ae4e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6168ae4e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6168ae4e
Branch: refs/heads/master
Commit: 6168ae4e9ccf2301df8ce742ab4455a8713df4f0
Parents: 9ecf26c
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Thu Jun 4 21:21:30 2015 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Thu Jun 4 21:21:30 2015 +0000
----------------------------------------------------------------------
storm-core/pom.xml | 5 +++++
storm-dist/binary/src/main/assembly/binary.xml | 1 +
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6168ae4e/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 69c2f0e..c43c6b2 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -424,6 +424,7 @@
<include>org.clojure:tools.cli</include>
<include>org.clojure:tools.macro</include>
<include>joda-time:joda-time</include>
+ <include>org.eclipse.jetty:*</include>
</includes>
</artifactSet>
@@ -564,6 +565,10 @@
<pattern>org.joda.time</pattern>
<shadedPattern>org.apache.storm.joda.time</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.eclipse.jetty</pattern>
+ <shadedPattern>org.apache.storm.jetty</shadedPattern>
+ </relocation>
</relocations>
<transformers>
<transformer implementation="org.apache.storm.maven.shade.clojure.ClojureTransformer" />
http://git-wip-us.apache.org/repos/asf/storm/blob/6168ae4e/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 a435312..3662424 100644
--- a/storm-dist/binary/src/main/assembly/binary.xml
+++ b/storm-dist/binary/src/main/assembly/binary.xml
@@ -58,6 +58,7 @@
<exclude>org.clojure:tools.cli</exclude>
<exclude>org.clojure:tools.macro</exclude>
<exclude>joda-time:joda-time</exclude>
+ <exclude>org.eclipse.jetty:*</exclude>
</excludes>
</dependencySet>
</dependencySets>