Skip to content

Commit b3e6fe7

Browse files
committed
[SPARK-23654][BUILD] remove jets3t as a dependency of spark
## What changes were proposed in this pull request? Remove jets3t dependency, and bouncy castle which it brings in; update licenses and deps Note this just takes over apache#21146 ## How was this patch tested? Existing tests. Closes apache#22081 from srowen/SPARK-23654. Authored-by: Sean Owen <[email protected]> Signed-off-by: Sean Owen <[email protected]>
1 parent ea63a7a commit b3e6fe7

File tree

12 files changed

+13
-78
lines changed

12 files changed

+13
-78
lines changed

LICENSE-binary

-2
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ org.apache.xbean:xbean-asm5-shaded
228228
com.squareup.okhttp3:logging-interceptor
229229
com.squareup.okhttp3:okhttp
230230
com.squareup.okio:okio
231-
net.java.dev.jets3t:jets3t
232231
org.apache.spark:spark-catalyst_2.11
233232
org.apache.spark:spark-kvstore_2.11
234233
org.apache.spark:spark-launcher_2.11
@@ -447,7 +446,6 @@ org.slf4j:jul-to-slf4j
447446
org.slf4j:slf4j-api
448447
org.slf4j:slf4j-log4j12
449448
com.github.scopt:scopt_2.11
450-
org.bouncycastle:bcprov-jdk15on
451449

452450
core/src/main/resources/org/apache/spark/ui/static/dagre-d3.min.js
453451
core/src/main/resources/org/apache/spark/ui/static/*dataTables*

NOTICE

-2
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,3 @@ The following provides more details on the included cryptographic software:
2626
This software uses Apache Commons Crypto (https://commons.apache.org/proper/commons-crypto/) to
2727
support authentication, and encryption and decryption of data sent across the network between
2828
services.
29-
30-
This software includes Bouncy Castle (http://bouncycastle.org/) to support the jets3t library.

NOTICE-binary

-21
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ This software uses Apache Commons Crypto (https://commons.apache.org/proper/comm
2727
support authentication, and encryption and decryption of data sent across the network between
2828
services.
2929

30-
This software includes Bouncy Castle (http://bouncycastle.org/) to support the jets3t library.
31-
3230

3331
// ------------------------------------------------------------------
3432
// NOTICE file corresponding to the section 4d of The Apache License,
@@ -1162,25 +1160,6 @@ NonlinearMinimizer class in package breeze.optimize.proximal is distributed with
11621160
2015, Debasish Das (Verizon), all rights reserved.
11631161

11641162

1165-
=========================================================================
1166-
== NOTICE file corresponding to section 4(d) of the Apache License, ==
1167-
== Version 2.0, in this case for the distribution of jets3t. ==
1168-
=========================================================================
1169-
1170-
This product includes software developed by:
1171-
1172-
The Apache Software Foundation (http://www.apache.org/).
1173-
1174-
The ExoLab Project (http://www.exolab.org/)
1175-
1176-
Sun Microsystems (http://www.sun.com/)
1177-
1178-
Codehaus (http://castor.codehaus.org)
1179-
1180-
Tatu Saloranta (http://wiki.fasterxml.com/TatuSaloranta)
1181-
1182-
1183-
11841163
stream-lib
11851164
Copyright 2016 AddThis
11861165

core/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
<version>${project.version}</version>
8989
</dependency>
9090
<dependency>
91-
<groupId>net.java.dev.jets3t</groupId>
92-
<artifactId>jets3t</artifactId>
91+
<groupId>javax.activation</groupId>
92+
<artifactId>activation</artifactId>
9393
</dependency>
9494
<dependency>
9595
<groupId>org.apache.curator</groupId>

dev/deps/spark-deps-hadoop-2.6

-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ automaton-1.11-8.jar
2121
avro-1.8.2.jar
2222
avro-ipc-1.8.2.jar
2323
avro-mapred-1.8.2-hadoop2.jar
24-
base64-2.3.8.jar
25-
bcprov-jdk15on-1.58.jar
2624
bonecp-0.8.0.RELEASE.jar
2725
breeze-macros_2.11-0.13.2.jar
2826
breeze_2.11-0.13.2.jar
@@ -101,7 +99,6 @@ jackson-module-paranamer-2.7.9.jar
10199
jackson-module-scala_2.11-2.6.7.1.jar
102100
jackson-xc-1.9.13.jar
103101
janino-3.0.8.jar
104-
java-xmlbuilder-1.1.jar
105102
javassist-3.18.1-GA.jar
106103
javax.annotation-api-1.2.jar
107104
javax.inject-1.jar
@@ -119,7 +116,6 @@ jersey-container-servlet-core-2.22.2.jar
119116
jersey-guava-2.22.2.jar
120117
jersey-media-jaxb-2.22.2.jar
121118
jersey-server-2.22.2.jar
122-
jets3t-0.9.4.jar
123119
jetty-6.1.26.jar
124120
jetty-util-6.1.26.jar
125121
jline-2.14.3.jar

dev/deps/spark-deps-hadoop-2.7

-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ automaton-1.11-8.jar
2121
avro-1.8.2.jar
2222
avro-ipc-1.8.2.jar
2323
avro-mapred-1.8.2-hadoop2.jar
24-
base64-2.3.8.jar
25-
bcprov-jdk15on-1.58.jar
2624
bonecp-0.8.0.RELEASE.jar
2725
breeze-macros_2.11-0.13.2.jar
2826
breeze_2.11-0.13.2.jar
@@ -101,7 +99,6 @@ jackson-module-paranamer-2.7.9.jar
10199
jackson-module-scala_2.11-2.6.7.1.jar
102100
jackson-xc-1.9.13.jar
103101
janino-3.0.8.jar
104-
java-xmlbuilder-1.1.jar
105102
javassist-3.18.1-GA.jar
106103
javax.annotation-api-1.2.jar
107104
javax.inject-1.jar
@@ -119,7 +116,6 @@ jersey-container-servlet-core-2.22.2.jar
119116
jersey-guava-2.22.2.jar
120117
jersey-media-jaxb-2.22.2.jar
121118
jersey-server-2.22.2.jar
122-
jets3t-0.9.4.jar
123119
jetty-6.1.26.jar
124120
jetty-sslengine-6.1.26.jar
125121
jetty-util-6.1.26.jar

dev/deps/spark-deps-hadoop-3.1

-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ automaton-1.11-8.jar
1919
avro-1.8.2.jar
2020
avro-ipc-1.8.2.jar
2121
avro-mapred-1.8.2-hadoop2.jar
22-
base64-2.3.8.jar
23-
bcprov-jdk15on-1.58.jar
2422
bonecp-0.8.0.RELEASE.jar
2523
breeze-macros_2.11-0.13.2.jar
2624
breeze_2.11-0.13.2.jar
@@ -100,7 +98,6 @@ jackson-module-jaxb-annotations-2.6.7.jar
10098
jackson-module-paranamer-2.7.9.jar
10199
jackson-module-scala_2.11-2.6.7.1.jar
102100
janino-3.0.8.jar
103-
java-xmlbuilder-1.1.jar
104101
javassist-3.18.1-GA.jar
105102
javax.annotation-api-1.2.jar
106103
javax.inject-1.jar
@@ -119,7 +116,6 @@ jersey-container-servlet-core-2.22.2.jar
119116
jersey-guava-2.22.2.jar
120117
jersey-media-jaxb-2.22.2.jar
121118
jersey-server-2.22.2.jar
122-
jets3t-0.9.4.jar
123119
jetty-webapp-9.3.24.v20180605.jar
124120
jetty-xml-9.3.24.v20180605.jar
125121
jline-2.14.3.jar

external/kafka-0-10-assembly/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,6 @@
9595
<artifactId>log4j</artifactId>
9696
<scope>provided</scope>
9797
</dependency>
98-
<dependency>
99-
<groupId>net.java.dev.jets3t</groupId>
100-
<artifactId>jets3t</artifactId>
101-
<scope>provided</scope>
102-
</dependency>
10398
<dependency>
10499
<groupId>org.scala-lang</groupId>
105100
<artifactId>scala-library</artifactId>

external/kafka-0-8-assembly/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,6 @@
9595
<artifactId>log4j</artifactId>
9696
<scope>provided</scope>
9797
</dependency>
98-
<dependency>
99-
<groupId>net.java.dev.jets3t</groupId>
100-
<artifactId>jets3t</artifactId>
101-
<scope>provided</scope>
102-
</dependency>
10398
<dependency>
10499
<groupId>org.scala-lang</groupId>
105100
<artifactId>scala-library</artifactId>

external/kinesis-asl-assembly/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@
8989
<artifactId>log4j</artifactId>
9090
<scope>provided</scope>
9191
</dependency>
92-
<dependency>
93-
<groupId>net.java.dev.jets3t</groupId>
94-
<artifactId>jets3t</artifactId>
95-
<scope>provided</scope>
96-
</dependency>
9792
<dependency>
9893
<groupId>org.apache.hadoop</groupId>
9994
<artifactId>hadoop-client</artifactId>

licenses-binary/LICENSE-bouncycastle-bcprov.txt

-7
This file was deleted.

pom.xml

+11-17
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
<codahale.metrics.version>3.1.5</codahale.metrics.version>
143143
<avro.version>1.8.2</avro.version>
144144
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
145-
<jets3t.version>0.9.4</jets3t.version>
146145
<aws.kinesis.client.version>1.8.10</aws.kinesis.client.version>
147146
<!-- Should be consistent with Kinesis client dependency -->
148147
<aws.java.sdk.version>1.11.271</aws.java.sdk.version>
@@ -911,6 +910,10 @@
911910
<groupId>com.sun.jersey.contribs</groupId>
912911
<artifactId>*</artifactId>
913912
</exclusion>
913+
<exclusion>
914+
<groupId>net.java.dev.jets3t</groupId>
915+
<artifactId>jets3t</artifactId>
916+
</exclusion>
914917
</exclusions>
915918
</dependency>
916919
<dependency>
@@ -984,24 +987,15 @@
984987
</exclusion>
985988
</exclusions>
986989
</dependency>
987-
<!-- See SPARK-1556 for info on this dependency: -->
990+
<!-- See SPARK-23654 for info on this dependency;
991+
It is used to keep javax.activation at v1.1.1 after dropping
992+
jets3t as a dependency.
993+
-->
988994
<dependency>
989-
<groupId>net.java.dev.jets3t</groupId>
990-
<artifactId>jets3t</artifactId>
991-
<version>${jets3t.version}</version>
995+
<groupId>javax.activation</groupId>
996+
<artifactId>activation</artifactId>
997+
<version>1.1.1</version>
992998
<scope>${hadoop.deps.scope}</scope>
993-
<exclusions>
994-
<exclusion>
995-
<groupId>commons-logging</groupId>
996-
<artifactId>commons-logging</artifactId>
997-
</exclusion>
998-
</exclusions>
999-
</dependency>
1000-
<dependency>
1001-
<groupId>org.bouncycastle</groupId>
1002-
<artifactId>bcprov-jdk15on</artifactId>
1003-
<!-- brought in by jets3t; see SPARK-22634 -->
1004-
<version>1.58</version>
1005999
</dependency>
10061000
<dependency>
10071001
<groupId>org.apache.hadoop</groupId>

0 commit comments

Comments
 (0)