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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/pom.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/examples/pom.xml b/examples/pom.xml index 6013085b10..1a0d5e5854 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -111,10 +111,6 @@ <groupId>org.jruby</groupId> <artifactId>jruby-complete</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> </exclusions> </dependency> <dependency> |