Skip to content

Commit fa3bdf6

Browse files
srowensrowen
committed
Remove dependency on Netty 3
1 parent 97b046f commit fa3bdf6

6 files changed

Lines changed: 24 additions & 70 deletions

File tree

‎LICENSE-binary‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ commons-codec:commons-codec
253253
commons-collections:commons-collections
254254
io.fabric8:kubernetes-client
255255
io.fabric8:kubernetes-model
256-
io.netty:netty
257256
io.netty:netty-all
258257
net.hydromatic:eigenbase-properties
259258
net.sf.supercsv:super-csv

‎NOTICE-binary‎

Lines changed: 16 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ The binary distribution of this product bundles binaries of
9595
Gson 2.2.4,
9696
which has the following notices:
9797

98+
9899
The Netty Project
99100
=================
100101

@@ -154,29 +155,16 @@ facade for Java, which can be obtained at:
154155
* HOMEPAGE:
155156
* http://www.slf4j.org/
156157

157-
This product contains a modified portion of 'ArrayDeque', written by Josh
158-
Bloch of Google, Inc:
159-
160-
* LICENSE:
161-
* license/LICENSE.deque.txt (Public Domain)
162-
163158
This product contains a modified portion of 'Apache Harmony', an open source
164159
Java SE, which can be obtained at:
165160

161+
* NOTICE:
162+
* license/NOTICE.harmony.txt
166163
* LICENSE:
167164
* license/LICENSE.harmony.txt (Apache License 2.0)
168165
* HOMEPAGE:
169166
* http://archive.apache.org/dist/harmony/
170167

171-
This product contains a modified version of Roland Kuhn's ASL2
172-
AbstractNodeQueue, which is based on Dmitriy Vyukov's non-intrusive MPSC queue.
173-
It can be obtained at:
174-
175-
* LICENSE:
176-
* license/LICENSE.abstractnodequeue.txt (Public Domain)
177-
* HOMEPAGE:
178-
* https://github.com/akka/akka/blob/wip-2.2.3-for-scala-2.11/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
179-
180168
This product contains a modified portion of 'jbzip2', a Java bzip2 compression
181169
and decompression library written by Matthew J. Francis. It can be obtained at:
182170

@@ -192,7 +180,7 @@ a constant-size alphabet written by Yuta Mori. It can be obtained at:
192180
* LICENSE:
193181
* license/LICENSE.libdivsufsort.txt (MIT License)
194182
* HOMEPAGE:
195-
* https://code.google.com/p/libdivsufsort/
183+
* https://github.com/y-256/libdivsufsort
196184

197185
This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
198186
which can be obtained at:
@@ -248,7 +236,7 @@ interchange format, which can be obtained at:
248236
* LICENSE:
249237
* license/LICENSE.protobuf.txt (New BSD License)
250238
* HOMEPAGE:
251-
* http://code.google.com/p/protobuf/
239+
* https://github.com/google/protobuf
252240

253241
This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
254242
a temporary self-signed X.509 certificate when the JVM does not provide the
@@ -265,7 +253,7 @@ by Google Inc, which can be obtained at:
265253
* LICENSE:
266254
* license/LICENSE.snappy.txt (New BSD License)
267255
* HOMEPAGE:
268-
* http://code.google.com/p/snappy/
256+
* https://github.com/google/snappy
269257

270258
This product optionally depends on 'JBoss Marshalling', an alternative Java
271259
serialization API, which can be obtained at:
@@ -281,7 +269,7 @@ benchmarking framework, which can be obtained at:
281269
* LICENSE:
282270
* license/LICENSE.caliper.txt (Apache License 2.0)
283271
* HOMEPAGE:
284-
* http://code.google.com/p/caliper/
272+
* https://github.com/google/caliper
285273

286274
This product optionally depends on 'Apache Commons Logging', a logging
287275
framework, which can be obtained at:
@@ -323,6 +311,15 @@ provides utilities for the java.lang API, which can be obtained at:
323311
* HOMEPAGE:
324312
* https://commons.apache.org/proper/commons-lang/
325313

314+
315+
This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
316+
317+
* LICENSE:
318+
* license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
319+
* HOMEPAGE:
320+
* https://github.com/takari/maven-wrapper
321+
322+
326323
The binary distribution of this product bundles binaries of
327324
Commons Codec 1.4,
328325
which has the following notices:
@@ -619,45 +616,6 @@ fixes; these can be found from file "VERSION.txt" in SCM.
619616
Apache Commons Net
620617
Copyright 2001-2012 The Apache Software Foundation
621618

622-
Copyright 2011 The Netty Project
623-
624-
http://www.apache.org/licenses/LICENSE-2.0
625-
626-
This product contains a modified version of 'JZlib', a re-implementation of
627-
zlib in pure Java, which can be obtained at:
628-
629-
* LICENSE:
630-
* license/LICENSE.jzlib.txt (BSD Style License)
631-
* HOMEPAGE:
632-
* http://www.jcraft.com/jzlib/
633-
634-
This product contains a modified version of 'Webbit', a Java event based
635-
WebSocket and HTTP server:
636-
637-
This product optionally depends on 'Protocol Buffers', Google's data
638-
interchange format, which can be obtained at:
639-
640-
This product optionally depends on 'SLF4J', a simple logging facade for Java,
641-
which can be obtained at:
642-
643-
This product optionally depends on 'Apache Log4J', a logging framework,
644-
which can be obtained at:
645-
646-
This product optionally depends on 'JBoss Logging', a logging framework,
647-
which can be obtained at:
648-
649-
* LICENSE:
650-
* license/LICENSE.jboss-logging.txt (GNU LGPL 2.1)
651-
* HOMEPAGE:
652-
* http://anonsvn.jboss.org/repos/common/common-logging-spi/
653-
654-
This product optionally depends on 'Apache Felix', an open source OSGi
655-
framework implementation, which can be obtained at:
656-
657-
* LICENSE:
658-
* license/LICENSE.felix.txt (Apache License 2.0)
659-
* HOMEPAGE:
660-
* http://felix.apache.org/
661619

662620
Jackson core and extension components may be licensed under different licenses.
663621
To find the details that apply to this artifact see the accompanying LICENSE file.

‎core/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,6 @@
273273
<groupId>io.netty</groupId>
274274
<artifactId>netty-all</artifactId>
275275
</dependency>
276-
<dependency>
277-
<groupId>io.netty</groupId>
278-
<artifactId>netty</artifactId>
279-
</dependency>
280276
<dependency>
281277
<groupId>com.clearspring.analytics</groupId>
282278
<artifactId>stream</artifactId>

‎dev/deps/spark-deps-hadoop-2.7‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ metrics-graphite-3.1.5.jar
149149
metrics-json-3.1.5.jar
150150
metrics-jvm-3.1.5.jar
151151
minlog-1.3.0.jar
152-
netty-3.9.9.Final.jar
153152
netty-all-4.1.30.Final.jar
154153
objenesis-2.5.1.jar
155154
okapi-shade-0.4.2.jar

‎dev/deps/spark-deps-hadoop-3.2‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ metrics-json-3.1.5.jar
166166
metrics-jvm-3.1.5.jar
167167
minlog-1.3.0.jar
168168
mssql-jdbc-6.2.1.jre7.jar
169-
netty-3.9.9.Final.jar
170169
netty-all-4.1.30.Final.jar
171170
nimbus-jose-jwt-4.41.1.jar
172171
objenesis-2.5.1.jar

‎pom.xml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -658,11 +658,6 @@
658658
<artifactId>netty-all</artifactId>
659659
<version>4.1.30.Final</version>
660660
</dependency>
661-
<dependency>
662-
<groupId>io.netty</groupId>
663-
<artifactId>netty</artifactId>
664-
<version>3.9.9.Final</version>
665-
</dependency>
666661
<dependency>
667662
<groupId>org.apache.derby</groupId>
668663
<artifactId>derby</artifactId>
@@ -979,6 +974,10 @@
979974
<groupId>org.jboss.netty</groupId>
980975
<artifactId>netty</artifactId>
981976
</exclusion>
977+
<exclusion>
978+
<groupId>io.netty</groupId>
979+
<artifactId>netty</artifactId>
980+
</exclusion>
982981
<exclusion>
983982
<!-- BeanUtils >= 1.9.0 no longer splits out -core; exclude it -->
984983
<groupId>commons-beanutils</groupId>
@@ -1326,6 +1325,10 @@
13261325
<groupId>jline</groupId>
13271326
<artifactId>jline</artifactId>
13281327
</exclusion>
1328+
<exclusion>
1329+
<groupId>io.netty</groupId>
1330+
<artifactId>netty</artifactId>
1331+
</exclusion>
13291332
</exclusions>
13301333
</dependency>
13311334
<dependency>

0 commit comments

Comments
 (0)