diff options
author | Josh Rosen <joshrosen@databricks.com> | 2016-01-11 00:31:29 -0800 |
---|---|---|
committer | Josh Rosen <joshrosen@databricks.com> | 2016-01-11 00:31:29 -0800 |
commit | f13c7f8f7dc8766b0a42406b5c3639d6be55cf33 (patch) | |
tree | 1fa819578243dd9e11093cdf09a8c5399f98feed /pom.xml | |
parent | 008a55828512056313da2626fd378e8aa1534790 (diff) | |
download | spark-f13c7f8f7dc8766b0a42406b5c3639d6be55cf33.tar.gz spark-f13c7f8f7dc8766b0a42406b5c3639d6be55cf33.tar.bz2 spark-f13c7f8f7dc8766b0a42406b5c3639d6be55cf33.zip |
[SPARK-12734][HOTFIX][TEST-MAVEN] Fix bug in Netty exclusions
This is a hotfix for a build bug introduced by the Netty exclusion changes in #10672. We can't exclude `io.netty:netty` because Akka depends on it. There's not a direct conflict between `io.netty:netty` and `io.netty:netty-all`, because the former puts classes in the `org.jboss.netty` namespace while the latter uses the `io.netty` namespace. However, there still is a conflict between `org.jboss.netty:netty` and `io.netty:netty`, so we need to continue to exclude the JBoss version of that artifact.
While the diff here looks somewhat large, note that this is only a revert of a some of the changes from #10672. You can see the net changes in pom.xml at https://github.com/apache/spark/compare/3119206b7188c23055621dfeaf6874f21c711a82...5211ab8#diff-600376dffeb79835ede4a0b285078036
Author: Josh Rosen <joshrosen@databricks.com>
Closes #10693 from JoshRosen/netty-hotfix.
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 50 |
1 files changed, 7 insertions, 43 deletions
@@ -519,12 +519,6 @@ <groupId>${akka.group}</groupId> <artifactId>akka-remote_${scala.binary.version}</artifactId> <version>${akka.version}</version> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>${akka.group}</groupId> @@ -768,10 +762,6 @@ <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -832,10 +822,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -937,10 +923,6 @@ <artifactId>netty</artifactId> </exclusion> <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> @@ -965,10 +947,6 @@ <artifactId>netty</artifactId> </exclusion> <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> @@ -998,10 +976,6 @@ <artifactId>netty</artifactId> </exclusion> <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> @@ -1030,10 +1004,6 @@ <artifactId>netty</artifactId> </exclusion> <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> @@ -1062,10 +1032,6 @@ <artifactId>netty</artifactId> </exclusion> <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> @@ -1085,10 +1051,6 @@ <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -1832,13 +1794,15 @@ </requireJavaVersion> <bannedDependencies> <excludes> - <exclude>io.netty:netty</exclude> + <!-- + Akka depends on io.netty:netty, which puts classes under the org.jboss.netty + package. This conflicts with the classes in org.jboss.netty:netty + artifact, so we have to ban that artifact here. In Netty 4.x, the classes + are under the io.netty package, so it's fine for us to depend on both + io.netty:netty and io.netty:netty-all. + --> <exclude>org.jboss.netty</exclude> </excludes> - <includes> - <!-- Required by Flume sink tests --> - <include>io.netty:netty:3.4.0.Final:*:test</include> - </includes> <searchTransitive>true</searchTransitive> </bannedDependencies> </rules> |