Skip to content

Commit cd7c2ea

Browse files
committed
put the dep in the right place
1 parent ac99aed commit cd7c2ea

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

spark-k8s/stackable/patches/3.5.6/0002-Backport-SPARK-51311-BUILD-Promote-bcprov-jdk18on-to.patch

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 078f639ddc0f7b108345dc5491c9a8ebe55e35bf Mon Sep 17 00:00:00 2001
1+
From 37d866706d952702effd640babf891fef349da7d Mon Sep 17 00:00:00 2001
22
From: Razvan-Daniel Mihai <[email protected]>
33
Date: Tue, 22 Jul 2025 17:34:03 +0200
44
Subject: Backport [SPARK-51311][BUILD] Promote bcprov-jdk18on to compile scope
55

66
---
77
LICENSE-binary | 1 +
8-
assembly/pom.xml | 13 +++++++++++++
8+
assembly/pom.xml | 14 ++++++++++++++
99
dev/deps/spark-deps-hadoop-3-hive-2.3 | 1 +
1010
licenses-binary/LICENSE-bouncycastle.txt | 13 +++++++++++++
11-
4 files changed, 28 insertions(+)
11+
4 files changed, 29 insertions(+)
1212
create mode 100644 licenses-binary/LICENSE-bouncycastle.txt
1313

1414
diff --git a/LICENSE-binary b/LICENSE-binary
@@ -24,13 +24,14 @@ index 05645977a0..9834cf333f 100644
2424
org.slf4j:jul-to-slf4j
2525
org.slf4j:slf4j-api
2626
diff --git a/assembly/pom.xml b/assembly/pom.xml
27-
index dcc46b0b82..fc3c11d385 100644
27+
index dcc46b0b82..def40ad52e 100644
2828
--- a/assembly/pom.xml
2929
+++ b/assembly/pom.xml
30-
@@ -87,6 +87,19 @@
30+
@@ -85,8 +85,22 @@
31+
<artifactId>guava</artifactId>
32+
<scope>${hadoop.deps.scope}</scope>
3133
</dependency>
32-
</dependencies>
33-
34+
+
3435
+ <!--
3536
+ Adapted from https://github.com/apache/spark/pull/50077
3637
+
@@ -42,7 +43,9 @@ index dcc46b0b82..fc3c11d385 100644
4243
+ <artifactId>bcprov-jdk18on</artifactId>
4344
+ <scope>${hadoop.deps.scope}</scope>
4445
+ </dependency>
45-
+ </dependencies>
46+
+
47+
</dependencies>
48+
4649
+
4750
<build>
4851
<plugins>

0 commit comments

Comments
 (0)