Skip to content

Commit d2cf95a

Browse files
committed
[SPARK-22634][BUILD] Update Bouncy Castle to 1.58
## What changes were proposed in this pull request? Update Bouncy Castle to 1.58, and jets3t to 0.9.4 to (sort of) match. ## How was this patch tested? Existing tests Author: Sean Owen <sowen@cloudera.com> Closes #19859 from srowen/SPARK-22634.
1 parent aa4cf2b commit d2cf95a

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

dev/deps/spark-deps-hadoop-2.6

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ avro-1.7.7.jar
2121
avro-ipc-1.7.7.jar
2222
avro-mapred-1.7.7-hadoop2.jar
2323
base64-2.3.8.jar
24-
bcprov-jdk15on-1.51.jar
24+
bcprov-jdk15on-1.58.jar
2525
bonecp-0.8.0.RELEASE.jar
2626
breeze-macros_2.11-0.13.2.jar
2727
breeze_2.11-0.13.2.jar
@@ -97,7 +97,7 @@ jackson-module-paranamer-2.7.9.jar
9797
jackson-module-scala_2.11-2.6.7.1.jar
9898
jackson-xc-1.9.13.jar
9999
janino-3.0.7.jar
100-
java-xmlbuilder-1.0.jar
100+
java-xmlbuilder-1.1.jar
101101
javassist-3.18.1-GA.jar
102102
javax.annotation-api-1.2.jar
103103
javax.inject-1.jar
@@ -115,7 +115,7 @@ jersey-container-servlet-core-2.22.2.jar
115115
jersey-guava-2.22.2.jar
116116
jersey-media-jaxb-2.22.2.jar
117117
jersey-server-2.22.2.jar
118-
jets3t-0.9.3.jar
118+
jets3t-0.9.4.jar
119119
jetty-6.1.26.jar
120120
jetty-util-6.1.26.jar
121121
jline-2.12.1.jar
@@ -137,14 +137,12 @@ log4j-1.2.17.jar
137137
lz4-java-1.4.0.jar
138138
machinist_2.11-0.6.1.jar
139139
macro-compat_2.11-1.1.1.jar
140-
mail-1.4.7.jar
141140
mesos-1.4.0-shaded-protobuf.jar
142141
metrics-core-3.1.5.jar
143142
metrics-graphite-3.1.5.jar
144143
metrics-json-3.1.5.jar
145144
metrics-jvm-3.1.5.jar
146145
minlog-1.3.0.jar
147-
mx4j-3.0.2.jar
148146
netty-3.9.9.Final.jar
149147
netty-all-4.0.47.Final.jar
150148
objenesis-2.1.jar

dev/deps/spark-deps-hadoop-2.7

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ avro-1.7.7.jar
2121
avro-ipc-1.7.7.jar
2222
avro-mapred-1.7.7-hadoop2.jar
2323
base64-2.3.8.jar
24-
bcprov-jdk15on-1.51.jar
24+
bcprov-jdk15on-1.58.jar
2525
bonecp-0.8.0.RELEASE.jar
2626
breeze-macros_2.11-0.13.2.jar
2727
breeze_2.11-0.13.2.jar
@@ -97,7 +97,7 @@ jackson-module-paranamer-2.7.9.jar
9797
jackson-module-scala_2.11-2.6.7.1.jar
9898
jackson-xc-1.9.13.jar
9999
janino-3.0.7.jar
100-
java-xmlbuilder-1.0.jar
100+
java-xmlbuilder-1.1.jar
101101
javassist-3.18.1-GA.jar
102102
javax.annotation-api-1.2.jar
103103
javax.inject-1.jar
@@ -115,7 +115,7 @@ jersey-container-servlet-core-2.22.2.jar
115115
jersey-guava-2.22.2.jar
116116
jersey-media-jaxb-2.22.2.jar
117117
jersey-server-2.22.2.jar
118-
jets3t-0.9.3.jar
118+
jets3t-0.9.4.jar
119119
jetty-6.1.26.jar
120120
jetty-util-6.1.26.jar
121121
jline-2.12.1.jar
@@ -138,14 +138,12 @@ log4j-1.2.17.jar
138138
lz4-java-1.4.0.jar
139139
machinist_2.11-0.6.1.jar
140140
macro-compat_2.11-1.1.1.jar
141-
mail-1.4.7.jar
142141
mesos-1.4.0-shaded-protobuf.jar
143142
metrics-core-3.1.5.jar
144143
metrics-graphite-3.1.5.jar
145144
metrics-json-3.1.5.jar
146145
metrics-jvm-3.1.5.jar
147146
minlog-1.3.0.jar
148-
mx4j-3.0.2.jar
149147
netty-3.9.9.Final.jar
150148
netty-all-4.0.47.Final.jar
151149
objenesis-2.1.jar

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<codahale.metrics.version>3.1.5</codahale.metrics.version>
142142
<avro.version>1.7.7</avro.version>
143143
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
144-
<jets3t.version>0.9.3</jets3t.version>
144+
<jets3t.version>0.9.4</jets3t.version>
145145
<aws.kinesis.client.version>1.7.3</aws.kinesis.client.version>
146146
<!-- Should be consistent with Kinesis client dependency -->
147147
<aws.java.sdk.version>1.11.76</aws.java.sdk.version>
@@ -985,6 +985,12 @@
985985
</exclusion>
986986
</exclusions>
987987
</dependency>
988+
<dependency>
989+
<groupId>org.bouncycastle</groupId>
990+
<artifactId>bcprov-jdk15on</artifactId>
991+
<!-- brought in by jets3t; see SPARK-22634 -->
992+
<version>1.58</version>
993+
</dependency>
988994
<dependency>
989995
<groupId>org.apache.hadoop</groupId>
990996
<artifactId>hadoop-yarn-api</artifactId>

0 commit comments

Comments
 (0)