Repository: spark Updated Branches: refs/heads/branch-1.0 7da80a318 -> b3d987893
Fix dep exclusion: avro-ipc, not avro, depends on netty. Author: Marcelo Vanzin <[email protected]> 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/b3d98789 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b3d98789 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b3d98789 Branch: refs/heads/branch-1.0 Commit: b3d987893a87a94c13865b9710c363ab163a2a08 Parents: 7da80a3 Author: Marcelo Vanzin <[email protected]> Authored: Wed May 14 00:37:57 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Wed May 14 00:40:08 2014 -0700 ---------------------------------------------------------------------- pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b3d98789/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 30b7181..d107e05 100644 --- a/pom.xml +++ b/pom.xml @@ -495,12 +495,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> @@ -508,6 +502,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>
