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 /dev/deps/spark-deps-hadoop-2.2 | |
| 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 'dev/deps/spark-deps-hadoop-2.2')
| -rw-r--r-- | dev/deps/spark-deps-hadoop-2.2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index 13d1b0e950..e4373f79f7 100644 --- a/dev/deps/spark-deps-hadoop-2.2 +++ b/dev/deps/spark-deps-hadoop-2.2 @@ -142,6 +142,7 @@ metrics-graphite-3.1.2.jar metrics-json-3.1.2.jar metrics-jvm-3.1.2.jar minlog-1.2.jar +netty-3.8.0.Final.jar netty-all-4.0.29.Final.jar objenesis-1.2.jar opencsv-2.3.jar |