diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-05-23 23:11:06 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-05-23 23:11:06 -0700 |
| commit | dbbedfc535dd92be2d12e4fc03165fffa9db1ead (patch) | |
| tree | de3636eb94f4e13a7ff915db74ff29135c5d24b4 | |
| parent | a2b0a7975c19bfd6ad24f03d36e140b508401adb (diff) | |
| parent | e7982c798efccd523165d0e347c7912ba14fcdd7 (diff) | |
| download | spark-dbbedfc535dd92be2d12e4fc03165fffa9db1ead.tar.gz spark-dbbedfc535dd92be2d12e4fc03165fffa9db1ead.tar.bz2 spark-dbbedfc535dd92be2d12e4fc03165fffa9db1ead.zip | |
Merge pull request #616 from jey/maven-netty-exclusion
Exclude old versions of Netty from Maven-based build
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | streaming/pom.xml | 6 |
2 files changed, 12 insertions, 0 deletions
@@ -565,6 +565,12 @@ <groupId>org.apache.avro</groupId> <artifactId>avro-ipc</artifactId> <version>1.7.1.cloudera.2</version> + <exclusions> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </dependencyManagement> diff --git a/streaming/pom.xml b/streaming/pom.xml index 08ff3e2ae1..4dc9a19d51 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -41,6 +41,12 @@ <groupId>org.apache.flume</groupId> <artifactId>flume-ng-sdk</artifactId> <version>1.2.0</version> + <exclusions> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.github.sgroschupf</groupId> |