Repository: incubator-slider Updated Branches: refs/heads/develop 66b1aa4a4 -> 70c1b1a7b
SLIDER-544 fix up dependencies before releasing Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/844e4b67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/844e4b67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/844e4b67 Branch: refs/heads/develop Commit: 844e4b6776c627f5eddeb22b233eff0da9cea55b Parents: 66b1aa4 Author: Steve Loughran <ste...@apache.org> Authored: Wed Nov 5 20:29:18 2014 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Nov 5 20:29:18 2014 +0000 ---------------------------------------------------------------------- pom.xml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/844e4b67/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f77a508..5a22cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ <slf4j.version>1.7.5</slf4j.version> <stringtemplate.version>2.4.1</stringtemplate.version> - <zookeeper.version>3.4.5</zookeeper.version> + <zookeeper.version>3.4.6</zookeeper.version> <!-- Plugin versions --> @@ -943,6 +943,18 @@ <groupId>org.junit</groupId> <artifactId>junit</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> </exclusions> </dependency> @@ -1228,6 +1240,13 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <version>${jetty.version}</version> + <exclusions> + <!-- cut the jetty version of the servlet API âHadoop ships with one--> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId>
