Skip to content

Commit cd8f7ff

Browse files
authored
chore(spark): bump 3.5.7 to 3.5.8 (#1420)
* add spark 3.5.8 * delete spark 3.5.7 * bump spark connect from 3.5.7 to 3.5.8 * update changelog * update hbase-connectors deps
1 parent 5c8c1e0 commit cd8f7ff

File tree

7 files changed

+21
-16
lines changed

7 files changed

+21
-16
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ All notable changes to this project will be documented in this file.
2222
- spark-k8s/hbase-connectors: new image extracted from spark dockerfile ([#1402]).
2323
- trino: Add `479` ([#1403]).
2424
- hbase: Add `2.6.4` (and phoenix `5.3.0`) ([#1408]).
25+
- spark: Add `3.5.8` ([#1414]).
26+
- spark-connect-client: Add `3.5.8` ([#1414]).
2527

2628
### Changed
2729

@@ -54,6 +56,8 @@ All notable changes to this project will be documented in this file.
5456
- trino: Remove `451` and `476` ([#1403]).
5557
- hbase: Remove `2.6.2` ([#1408]).
5658
- spark: remove the JRE before installing the JDK to prevent version conflicts ([#1410]).
59+
- spark: Remove `3.5.7` ([#1414]).
60+
- spark-connect-client: Remove `3.5.7` ([#1414]).
5761

5862
### Fixed
5963

@@ -89,6 +93,7 @@ All notable changes to this project will be documented in this file.
8993
[#1408]: https://github.com/stackabletech/docker-images/pull/1408
9094
[#1409]: https://github.com/stackabletech/docker-images/pull/1409
9195
[#1410]: https://github.com/stackabletech/docker-images/pull/1410
96+
[#1414]: https://github.com/stackabletech/docker-images/pull/1414
9297

9398
## [25.11.0] - 2025-11-07
9499

spark-connect-client/boil-config.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
[versions."3.5.7".local-images]
2-
spark-k8s = "3.5.7"
1+
[versions."3.5.8".local-images]
2+
spark-k8s = "3.5.8"
33
java-base = "17"
44

5-
[versions."3.5.7".build-arguments]
5+
[versions."3.5.8".build-arguments]
66
python-version = "3.11"
77

88
[versions."4.0.1".local-images]

spark-k8s/boil-config.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
[versions."3.5.7"]
1+
[versions."3.5.8"]
22
containerfile = "Dockerfile.3"
33

4-
[versions."3.5.7".local-images]
4+
[versions."3.5.8".local-images]
55
"hadoop/hadoop" = "3.4.2"
66
java-base = "17"
77
java-devel = "17"
88
hbase = "2.6.3"
99
"spark-k8s/hbase-connectors" = "1.0.1_3"
1010

11-
[versions."3.5.7".build-arguments]
11+
[versions."3.5.8".build-arguments]
1212
python-version = "3.11"
1313
aws-java-sdk-bundle-version = "2.29.52" # needs to match the version shipped by Hadoop
1414
azure-storage-version = "7.0.1" # needs to match the version shipped by Hadoop

spark-k8s/hbase-connectors/boil-config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ containerfile = "Dockerfile"
55
java-devel = "17"
66

77
[versions."1.0.1_3".build-arguments]
8-
spark-version = "3.5.7"
8+
spark-version = "3.5.8"
99
hadoop-version = "3.4.2"
1010
hbase-version = "2.6.3"

spark-k8s/stackable/patches/3.5.7/0001-Update-CycloneDX-plugin.patch renamed to spark-k8s/stackable/patches/3.5.8/0001-Update-CycloneDX-plugin.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5e3c5568d4bf0fdd4feb19e559d606a55a0d2569 Mon Sep 17 00:00:00 2001
1+
From 4a1e0b6cb70add10e83c071b6402b76bab1ac380 Mon Sep 17 00:00:00 2001
22
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
33
Date: Tue, 11 Mar 2025 17:29:39 +0200
44
Subject: Update CycloneDX plugin
@@ -9,7 +9,7 @@ Subject: Update CycloneDX plugin
99
2 files changed, 6 insertions(+), 2 deletions(-)
1010

1111
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
12-
index ef7c010e93..0f4c1c74e4 100755
12+
index ef7c010e930..0f4c1c74e40 100755
1313
--- a/dev/make-distribution.sh
1414
+++ b/dev/make-distribution.sh
1515
@@ -171,7 +171,6 @@ BUILD_COMMAND=("$MVN" clean package \
@@ -21,7 +21,7 @@ index ef7c010e93..0f4c1c74e4 100755
2121

2222
# Actually build the jar
2323
diff --git a/pom.xml b/pom.xml
24-
index a0e25ce4d8..b3755a04e7 100644
24+
index edd2ad57880..667f6f8cbfb 100644
2525
--- a/pom.xml
2626
+++ b/pom.xml
2727
@@ -3534,7 +3534,12 @@

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0cfb1d6b733579ea91df842e685df9db5512ece8 Mon Sep 17 00:00:00 2001
1+
From 49abdb63abc57d1b905dbd333d4b0ac487d42ae7 Mon Sep 17 00:00:00 2001
22
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
33
Date: Tue, 22 Jul 2025 17:34:03 +0200
44
Subject: Backport [SPARK-51311][BUILD] Promote bcprov-jdk18on to compile scope
@@ -12,7 +12,7 @@ Subject: Backport [SPARK-51311][BUILD] Promote bcprov-jdk18on to compile scope
1212
create mode 100644 licenses-binary/LICENSE-bouncycastle.txt
1313

1414
diff --git a/LICENSE-binary b/LICENSE-binary
15-
index 05645977a0..9834cf333f 100644
15+
index 05645977a0b..9834cf333f7 100644
1616
--- a/LICENSE-binary
1717
+++ b/LICENSE-binary
1818
@@ -480,6 +480,7 @@ org.typelevel:algebra_2.12:jar
@@ -24,7 +24,7 @@ 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 ffa6a0e2b0..19032d6054 100644
27+
index 1533c2f0c2d..d75faf07900 100644
2828
--- a/assembly/pom.xml
2929
+++ b/assembly/pom.xml
3030
@@ -85,8 +85,22 @@
@@ -51,7 +51,7 @@ index ffa6a0e2b0..19032d6054 100644
5151
<plugins>
5252
<plugin>
5353
diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
54-
index f110a1988f..88324d3e27 100644
54+
index b4d91a1b161..b7409dd53fa 100644
5555
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
5656
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
5757
@@ -28,6 +28,7 @@ aws-java-sdk-bundle/1.12.262//aws-java-sdk-bundle-1.12.262.jar
@@ -64,7 +64,7 @@ index f110a1988f..88324d3e27 100644
6464
breeze-macros_2.12/2.1.0//breeze-macros_2.12-2.1.0.jar
6565
diff --git a/licenses-binary/LICENSE-bouncycastle.txt b/licenses-binary/LICENSE-bouncycastle.txt
6666
new file mode 100644
67-
index 0000000000..277dcd1ebb
67+
index 00000000000..277dcd1ebbb
6868
--- /dev/null
6969
+++ b/licenses-binary/LICENSE-bouncycastle.txt
7070
@@ -0,0 +1,13 @@
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
base = "ed00d046951a7ecda6429accd3b9c5b2dc792b65"
1+
base = "5a48a37b2dbd7b51e3640cd1d947438459556cc6"
22
mirror = "https://github.com/stackabletech/spark.git"

0 commit comments

Comments
 (0)