Repository: spark Updated Branches: refs/heads/master b22952fa1 -> 54ae8328b
Fix dep exclusion: avro-ipc, not avro, depends on netty. Author: Marcelo Vanzin <van...@cloudera.com> Closes #763 from vanzin/netty-dep-hell and squashes the following commits: dfb6ce2 [Marcelo Vanzin] Fix dep exclusion: avro-ipc, not avro, depends on netty. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/54ae8328 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/54ae8328 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/54ae8328 Branch: refs/heads/master Commit: 54ae8328bd7d052ba347768cfb02cb5dfdd8045e Parents: b22952f Author: Marcelo Vanzin <van...@cloudera.com> Authored: Wed May 14 00:37:57 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Wed May 14 00:37:57 2014 -0700 ---------------------------------------------------------------------- pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/54ae8328/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4d4c5f6..786b6d4 100644 --- a/pom.xml +++ b/pom.xml @@ -496,12 +496,6 @@ <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> <version>${avro.version}</version> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.avro</groupId> @@ -509,6 +503,10 @@ <version>${avro.version}</version> <exclusions> <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> </exclusion>
