Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ All notable changes to this project will be documented in this file.
- spark-k8s/hbase-connectors: new image extracted from spark dockerfile ([#1402]).
- trino: Add `479` ([#1403]).
- hbase: Add `2.6.4` (and phoenix `5.3.0`) ([#1408]).
- spark: Add `3.5.8` ([#1414]).
- spark-connect-client: Add `3.5.8` ([#1414]).

### Changed

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

### Fixed

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

## [25.11.0] - 2025-11-07

Expand Down
6 changes: 3 additions & 3 deletions spark-connect-client/boil-config.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions."3.5.7".local-images]
spark-k8s = "3.5.7"
[versions."3.5.8".local-images]
spark-k8s = "3.5.8"
java-base = "17"

[versions."3.5.7".build-arguments]
[versions."3.5.8".build-arguments]
python-version = "3.11"

[versions."4.0.1".local-images]
Expand Down
6 changes: 3 additions & 3 deletions spark-k8s/boil-config.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions."3.5.7"]
[versions."3.5.8"]
containerfile = "Dockerfile.3"

[versions."3.5.7".local-images]
[versions."3.5.8".local-images]
"hadoop/hadoop" = "3.4.2"
java-base = "17"
java-devel = "17"
hbase = "2.6.3"
"spark-k8s/hbase-connectors" = "1.0.1_3"

[versions."3.5.7".build-arguments]
[versions."3.5.8".build-arguments]
python-version = "3.11"
aws-java-sdk-bundle-version = "2.29.52" # needs to match the version shipped by Hadoop
azure-storage-version = "7.0.1" # needs to match the version shipped by Hadoop
Expand Down
2 changes: 1 addition & 1 deletion spark-k8s/hbase-connectors/boil-config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ containerfile = "Dockerfile"
java-devel = "17"

[versions."1.0.1_3".build-arguments]
spark-version = "3.5.7"
spark-version = "3.5.8"
hadoop-version = "3.4.2"
hbase-version = "2.6.3"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5e3c5568d4bf0fdd4feb19e559d606a55a0d2569 Mon Sep 17 00:00:00 2001
From 4a1e0b6cb70add10e83c071b6402b76bab1ac380 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Tue, 11 Mar 2025 17:29:39 +0200
Subject: Update CycloneDX plugin
Expand All @@ -9,7 +9,7 @@ Subject: Update CycloneDX plugin
2 files changed, 6 insertions(+), 2 deletions(-)

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

# Actually build the jar
diff --git a/pom.xml b/pom.xml
index a0e25ce4d8..b3755a04e7 100644
index edd2ad57880..667f6f8cbfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3534,7 +3534,12 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0cfb1d6b733579ea91df842e685df9db5512ece8 Mon Sep 17 00:00:00 2001
From 49abdb63abc57d1b905dbd333d4b0ac487d42ae7 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Tue, 22 Jul 2025 17:34:03 +0200
Subject: Backport [SPARK-51311][BUILD] Promote bcprov-jdk18on to compile scope
Expand All @@ -12,7 +12,7 @@ Subject: Backport [SPARK-51311][BUILD] Promote bcprov-jdk18on to compile scope
create mode 100644 licenses-binary/LICENSE-bouncycastle.txt

diff --git a/LICENSE-binary b/LICENSE-binary
index 05645977a0..9834cf333f 100644
index 05645977a0b..9834cf333f7 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -480,6 +480,7 @@ org.typelevel:algebra_2.12:jar
Expand All @@ -24,7 +24,7 @@ index 05645977a0..9834cf333f 100644
org.slf4j:jul-to-slf4j
org.slf4j:slf4j-api
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ffa6a0e2b0..19032d6054 100644
index 1533c2f0c2d..d75faf07900 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -85,8 +85,22 @@
Expand All @@ -51,7 +51,7 @@ index ffa6a0e2b0..19032d6054 100644
<plugins>
<plugin>
diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
index f110a1988f..88324d3e27 100644
index b4d91a1b161..b7409dd53fa 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -28,6 +28,7 @@ aws-java-sdk-bundle/1.12.262//aws-java-sdk-bundle-1.12.262.jar
Expand All @@ -64,7 +64,7 @@ index f110a1988f..88324d3e27 100644
breeze-macros_2.12/2.1.0//breeze-macros_2.12-2.1.0.jar
diff --git a/licenses-binary/LICENSE-bouncycastle.txt b/licenses-binary/LICENSE-bouncycastle.txt
new file mode 100644
index 0000000000..277dcd1ebb
index 00000000000..277dcd1ebbb
--- /dev/null
+++ b/licenses-binary/LICENSE-bouncycastle.txt
@@ -0,0 +1,13 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
base = "ed00d046951a7ecda6429accd3b9c5b2dc792b65"
base = "5a48a37b2dbd7b51e3640cd1d947438459556cc6"
mirror = "https://github.com/stackabletech/spark.git"