Skip to content

Commit 62ec721

Browse files
committed
update patches for spark 3.5.5
1 parent cd7c2ea commit 62ec721

File tree

1 file changed

+83
-0
lines changed

1 file changed

+83
-0
lines changed
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
From c4a23f0060f34a2e1c3b826b9698ad56a5ce7176 Mon Sep 17 00:00:00 2001
2+
From: Razvan-Daniel Mihai <[email protected]>
3+
Date: Tue, 22 Jul 2025 18:51:28 +0200
4+
Subject: Backport [SPARK-51311][BUILD] Promote bcprov-jdk18on to compile scope
5+
6+
---
7+
LICENSE-binary | 1 +
8+
assembly/pom.xml | 14 ++++++++++++++
9+
dev/deps/spark-deps-hadoop-3-hive-2.3 | 1 +
10+
licenses-binary/LICENSE-bouncycastle.txt | 13 +++++++++++++
11+
4 files changed, 29 insertions(+)
12+
create mode 100644 licenses-binary/LICENSE-bouncycastle.txt
13+
14+
diff --git a/LICENSE-binary b/LICENSE-binary
15+
index 05645977a0..9834cf333f 100644
16+
--- a/LICENSE-binary
17+
+++ b/LICENSE-binary
18+
@@ -480,6 +480,7 @@ org.typelevel:algebra_2.12:jar
19+
org.typelevel:cats-kernel_2.12
20+
org.typelevel:machinist_2.12
21+
net.razorvine:pickle
22+
+org.bouncycastle:bcprov-jdk18on
23+
org.slf4j:jcl-over-slf4j
24+
org.slf4j:jul-to-slf4j
25+
org.slf4j:slf4j-api
26+
diff --git a/assembly/pom.xml b/assembly/pom.xml
27+
index 2066bbeb7e..05edd80958 100644
28+
--- a/assembly/pom.xml
29+
+++ b/assembly/pom.xml
30+
@@ -85,8 +85,22 @@
31+
<artifactId>guava</artifactId>
32+
<scope>${hadoop.deps.scope}</scope>
33+
</dependency>
34+
+
35+
+ <!--
36+
+ Adapted from https://github.com/apache/spark/pull/50077
37+
+
38+
+ SPARK-51311: HDFS-15098 (3.4.0) adds hard dependency on bcprov-jdk18on, Spark fails to submit
39+
+ to Kerberized cluster without this dependency, until HADOOP-19152 (3.5.0, unreleased)
40+
+ -->
41+
+ <dependency>
42+
+ <groupId>org.bouncycastle</groupId>
43+
+ <artifactId>bcprov-jdk18on</artifactId>
44+
+ <scope>${hadoop.deps.scope}</scope>
45+
+ </dependency>
46+
+
47+
</dependencies>
48+
49+
+
50+
<build>
51+
<plugins>
52+
<plugin>
53+
diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
54+
index 4feea62dfe..df85dcb6f5 100644
55+
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
56+
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
57+
@@ -28,6 +28,7 @@ aws-java-sdk-bundle/1.12.262//aws-java-sdk-bundle-1.12.262.jar
58+
azure-data-lake-store-sdk/2.3.9//azure-data-lake-store-sdk-2.3.9.jar
59+
azure-keyvault-core/1.0.0//azure-keyvault-core-1.0.0.jar
60+
azure-storage/7.0.1//azure-storage-7.0.1.jar
61+
+bcprov-jdk18on/1.77//bcprov-jdk18on-1.77.jar
62+
blas/3.0.3//blas-3.0.3.jar
63+
bonecp/0.8.0.RELEASE//bonecp-0.8.0.RELEASE.jar
64+
breeze-macros_2.12/2.1.0//breeze-macros_2.12-2.1.0.jar
65+
diff --git a/licenses-binary/LICENSE-bouncycastle.txt b/licenses-binary/LICENSE-bouncycastle.txt
66+
new file mode 100644
67+
index 0000000000..277dcd1ebb
68+
--- /dev/null
69+
+++ b/licenses-binary/LICENSE-bouncycastle.txt
70+
@@ -0,0 +1,13 @@
71+
+Copyright (c) 2000-2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org).
72+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
73+
+associated documentation files (the "Software"), to deal in the Software without restriction,
74+
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
75+
+sub license, and/or sell copies of the Software, and to permit persons to whom the Software is
76+
+furnished to do so, subject to the following conditions: The above copyright notice and this
77+
+permission notice shall be included in all copies or substantial portions of the Software.
78+
+
79+
+**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
80+
+NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
81+
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
82+
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
83+
+OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.**

0 commit comments

Comments
 (0)