aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorMarcelo Vanzin <vanzin@cloudera.com>2014-05-14 00:37:57 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-05-14 00:37:57 -0700
commit54ae8328bd7d052ba347768cfb02cb5dfdd8045e (patch)
tree6792e3aa0284987a89948707c2f4c2fc4e5df27d /pom.xml
parentb22952fa1f21c0b93208846b5e1941a9d2578c6f (diff)
downloadspark-54ae8328bd7d052ba347768cfb02cb5dfdd8045e.tar.gz
spark-54ae8328bd7d052ba347768cfb02cb5dfdd8045e.tar.bz2
spark-54ae8328bd7d052ba347768cfb02cb5dfdd8045e.zip
Fix dep exclusion: avro-ipc, not avro, depends on netty.
Author: Marcelo Vanzin <vanzin@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.
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml10
1 files changed, 4 insertions, 6 deletions
diff --git a/pom.xml b/pom.xml
index 4d4c5f63e4..786b6d4984 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>