You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by qi...@apache.org on 2016/11/04 10:41:29 UTC
incubator-eagle git commit: [MINOR] Exclude jetty & old servlet-api
Repository: incubator-eagle
Updated Branches:
refs/heads/master 82b1c2249 -> 38f292644
[MINOR] Exclude jetty & old servlet-api
Dropwizard, hadoop and Jetty (included by eagle-common module) depends on different version servlet-api, it causes jar conflicts issue.
Author: Xiancheng Li <xi...@ebay.com>
Closes #611 from garrettlish/master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/38f29264
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/38f29264
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/38f29264
Branch: refs/heads/master
Commit: 38f2926448f1227761edafa367080d95ade9d255
Parents: 82b1c22
Author: Xiancheng Li <xi...@ebay.com>
Authored: Fri Nov 4 18:41:22 2016 +0800
Committer: Zhao, Qingwen <qi...@apache.org>
Committed: Fri Nov 4 18:41:22 2016 +0800
----------------------------------------------------------------------
.../eagle-alert-parent/eagle-alert/alert-service/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/38f29264/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml
index e3d3c4c..cc970e8 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/pom.xml
@@ -37,6 +37,14 @@
<artifactId>storm-core</artifactId>
<groupId>org.apache.storm</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>