Skip to content

Commit f13c7f8

Browse files
JoshRosenJoshRosen
committed
[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 3119206...5211ab8#diff-600376dffeb79835ede4a0b285078036 Author: Josh Rosen <[email protected]> Closes #10693 from JoshRosen/netty-hotfix.
1 parent 008a558 commit f13c7f8

File tree

6 files changed

+11
-47
lines changed

6 files changed

+11
-47
lines changed

‎dev/deps/spark-deps-hadoop-2.2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ metrics-graphite-3.1.2.jar
142142
metrics-json-3.1.2.jar
143143
metrics-jvm-3.1.2.jar
144144
minlog-1.2.jar
145+
netty-3.8.0.Final.jar
145146
netty-all-4.0.29.Final.jar
146147
objenesis-1.2.jar
147148
opencsv-2.3.jar

‎dev/deps/spark-deps-hadoop-2.3‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ metrics-json-3.1.2.jar
133133
metrics-jvm-3.1.2.jar
134134
minlog-1.2.jar
135135
mx4j-3.0.2.jar
136+
netty-3.8.0.Final.jar
136137
netty-all-4.0.29.Final.jar
137138
objenesis-1.2.jar
138139
opencsv-2.3.jar

‎dev/deps/spark-deps-hadoop-2.4‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ metrics-json-3.1.2.jar
134134
metrics-jvm-3.1.2.jar
135135
minlog-1.2.jar
136136
mx4j-3.0.2.jar
137+
netty-3.8.0.Final.jar
137138
netty-all-4.0.29.Final.jar
138139
objenesis-1.2.jar
139140
opencsv-2.3.jar

‎dev/deps/spark-deps-hadoop-2.6‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ metrics-json-3.1.2.jar
140140
metrics-jvm-3.1.2.jar
141141
minlog-1.2.jar
142142
mx4j-3.0.2.jar
143+
netty-3.8.0.Final.jar
143144
netty-all-4.0.29.Final.jar
144145
objenesis-1.2.jar
145146
opencsv-2.3.jar

‎examples/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@
111111
<groupId>org.jruby</groupId>
112112
<artifactId>jruby-complete</artifactId>
113113
</exclusion>
114-
<exclusion>
115-
<groupId>io.netty</groupId>
116-
<artifactId>netty</artifactId>
117-
</exclusion>
118114
</exclusions>
119115
</dependency>
120116
<dependency>

‎pom.xml‎

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -519,12 +519,6 @@
519519
<groupId>${akka.group}</groupId>
520520
<artifactId>akka-remote_${scala.binary.version}</artifactId>
521521
<version>${akka.version}</version>
522-
<exclusions>
523-
<exclusion>
524-
<groupId>io.netty</groupId>
525-
<artifactId>netty</artifactId>
526-
</exclusion>
527-
</exclusions>
528522
</dependency>
529523
<dependency>
530524
<groupId>${akka.group}</groupId>
@@ -768,10 +762,6 @@
768762
<groupId>org.jboss.netty</groupId>
769763
<artifactId>netty</artifactId>
770764
</exclusion>
771-
<exclusion>
772-
<groupId>io.netty</groupId>
773-
<artifactId>netty</artifactId>
774-
</exclusion>
775765
</exclusions>
776766
</dependency>
777767
<dependency>
@@ -832,10 +822,6 @@
832822
<groupId>junit</groupId>
833823
<artifactId>junit</artifactId>
834824
</exclusion>
835-
<exclusion>
836-
<groupId>io.netty</groupId>
837-
<artifactId>netty</artifactId>
838-
</exclusion>
839825
</exclusions>
840826
</dependency>
841827
<dependency>
@@ -936,10 +922,6 @@
936922
<groupId>org.jboss.netty</groupId>
937923
<artifactId>netty</artifactId>
938924
</exclusion>
939-
<exclusion>
940-
<groupId>io.netty</groupId>
941-
<artifactId>netty</artifactId>
942-
</exclusion>
943925
<exclusion>
944926
<groupId>commons-logging</groupId>
945927
<artifactId>commons-logging</artifactId>
@@ -964,10 +946,6 @@
964946
<groupId>org.jboss.netty</groupId>
965947
<artifactId>netty</artifactId>
966948
</exclusion>
967-
<exclusion>
968-
<groupId>io.netty</groupId>
969-
<artifactId>netty</artifactId>
970-
</exclusion>
971949
<exclusion>
972950
<groupId>javax.servlet</groupId>
973951
<artifactId>servlet-api</artifactId>
@@ -997,10 +975,6 @@
997975
<groupId>org.jboss.netty</groupId>
998976
<artifactId>netty</artifactId>
999977
</exclusion>
1000-
<exclusion>
1001-
<groupId>io.netty</groupId>
1002-
<artifactId>netty</artifactId>
1003-
</exclusion>
1004978
<exclusion>
1005979
<groupId>javax.servlet</groupId>
1006980
<artifactId>servlet-api</artifactId>
@@ -1029,10 +1003,6 @@
10291003
<groupId>org.jboss.netty</groupId>
10301004
<artifactId>netty</artifactId>
10311005
</exclusion>
1032-
<exclusion>
1033-
<groupId>io.netty</groupId>
1034-
<artifactId>netty</artifactId>
1035-
</exclusion>
10361006
<exclusion>
10371007
<groupId>javax.servlet</groupId>
10381008
<artifactId>servlet-api</artifactId>
@@ -1061,10 +1031,6 @@
10611031
<groupId>org.jboss.netty</groupId>
10621032
<artifactId>netty</artifactId>
10631033
</exclusion>
1064-
<exclusion>
1065-
<groupId>io.netty</groupId>
1066-
<artifactId>netty</artifactId>
1067-
</exclusion>
10681034
<exclusion>
10691035
<groupId>javax.servlet</groupId>
10701036
<artifactId>servlet-api</artifactId>
@@ -1085,10 +1051,6 @@
10851051
<groupId>org.jboss.netty</groupId>
10861052
<artifactId>netty</artifactId>
10871053
</exclusion>
1088-
<exclusion>
1089-
<groupId>io.netty</groupId>
1090-
<artifactId>netty</artifactId>
1091-
</exclusion>
10921054
</exclusions>
10931055
</dependency>
10941056
<dependency>
@@ -1832,13 +1794,15 @@
18321794
</requireJavaVersion>
18331795
<bannedDependencies>
18341796
<excludes>
1835-
<exclude>io.netty:netty</exclude>
1797+
<!--
1798+
Akka depends on io.netty:netty, which puts classes under the org.jboss.netty
1799+
package. This conflicts with the classes in org.jboss.netty:netty
1800+
artifact, so we have to ban that artifact here. In Netty 4.x, the classes
1801+
are under the io.netty package, so it's fine for us to depend on both
1802+
io.netty:netty and io.netty:netty-all.
1803+
-->
18361804
<exclude>org.jboss.netty</exclude>
18371805
</excludes>
1838-
<includes>
1839-
<!-- Required by Flume sink tests -->
1840-
<include>io.netty:netty:3.4.0.Final:*:test</include>
1841-
</includes>
18421806
<searchTransitive>true</searchTransitive>
18431807
</bannedDependencies>
18441808
</rules>

0 commit comments

Comments
 (0)