Skip to content

Commit c0e6ca9

Browse files
authored
feat(spark): Add 4.1.2 (#1550)
* feat(spark): Add 4.1.2 * chore(spark): Bump jackson-dataformat-xml-version to 2.21.2 * chore: Update changelog * feat(spark-connect-client): Add 4.1.2
1 parent 5b659b4 commit c0e6ca9

5 files changed

Lines changed: 67 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file.
1919
- hadoop: Add `3.5.0` and `3.4.3` ([#1511]).
2020
- airflow: Add `3.2.2` ([#1519], [#1541]).
2121
- druid: Add `37.0.0` ([#1535]).
22+
- spark: Add `4.1.2` ([#1550]).
2223

2324
### Changed
2425

@@ -82,6 +83,7 @@ All notable changes to this project will be documented in this file.
8283
[#1539]: https://github.com/stackabletech/docker-images/pull/1539
8384
[#1541]: https://github.com/stackabletech/docker-images/pull/1541
8485
[#1548]: https://github.com/stackabletech/docker-images/pull/1548
86+
[#1550]: https://github.com/stackabletech/docker-images/pull/1550
8587

8688
## [26.3.0] - 2026-03-16
8789

spark-connect-client/boil-config.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@ java-base = "21"
1414

1515
[versions."4.1.1".build-arguments]
1616
python-version = "3.12"
17+
18+
[versions."4.1.2".local-images]
19+
spark-k8s = "4.1.2"
20+
java-base = "21"
21+
22+
[versions."4.1.2".build-arguments]
23+
python-version = "3.12"

spark-k8s/boil-config.toml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ jmx-exporter-version = "1.3.0"
2121
tini-version = "0.19.0"
2222
hbase-connector-version = "1.0.1_3.5.8"
2323

24-
25-
26-
# LTS since 26.7.0
24+
# Deprecated since 26.7
2725
[versions."4.1.1"]
2826
containerfile = "Dockerfile.4"
2927

@@ -39,3 +37,20 @@ stax2-api-version = "4.2.2" # Needs to match https://mvnrepository
3937
woodstox-core-version = "7.1.1" # Needs to match https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.20.0
4038
jmx-exporter-version = "1.3.0"
4139
tini-version = "0.19.0"
40+
41+
# LTS since 26.7.0
42+
[versions."4.1.2"]
43+
containerfile = "Dockerfile.4"
44+
45+
[versions."4.1.2".local-images]
46+
"hadoop/hadoop" = "3.4.3"
47+
java-base = "21"
48+
java-devel = "21"
49+
50+
[versions."4.1.2".build-arguments]
51+
python-version = "3.12"
52+
jackson-dataformat-xml-version = "2.21.2" # Needs to match https://mvnrepository.com/artifact/org.apache.spark/spark-parent_2.13/4.1.2
53+
stax2-api-version = "4.2.2" # Needs to match https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.21.2
54+
woodstox-core-version = "7.1.1" # Needs to match https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.21.2
55+
jmx-exporter-version = "1.3.0"
56+
tini-version = "0.19.0"
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 202ac6e7a2f3183702bdfeb2ea45528a125856d0 Mon Sep 17 00:00:00 2001
2+
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
3+
Date: Thu, 15 Jan 2026 14:27:23 +0100
4+
Subject: Update CycloneDX plugin
5+
6+
---
7+
dev/make-distribution.sh | 1 -
8+
pom.xml | 5 +++++
9+
2 files changed, 5 insertions(+), 1 deletion(-)
10+
11+
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
12+
index 16598bda87..327fa76314 100755
13+
--- a/dev/make-distribution.sh
14+
+++ b/dev/make-distribution.sh
15+
@@ -185,7 +185,6 @@ else
16+
-Dmaven.javadoc.skip=true \
17+
-Dmaven.scaladoc.skip=true \
18+
-Dmaven.source.skip \
19+
- -Dcyclonedx.skip=true \
20+
$@)
21+
fi
22+
23+
diff --git a/pom.xml b/pom.xml
24+
index dc20115199..b2fbb0d58f 100644
25+
--- a/pom.xml
26+
+++ b/pom.xml
27+
@@ -3333,6 +3333,11 @@
28+
<groupId>org.cyclonedx</groupId>
29+
<artifactId>cyclonedx-maven-plugin</artifactId>
30+
<version>2.9.1</version>
31+
+ <configuration>
32+
+ <projectType>application</projectType>
33+
+ <schemaVersion>1.5</schemaVersion>
34+
+ <skipNotDeployed>false</skipNotDeployed>
35+
+ </configuration>
36+
<executions>
37+
<execution>
38+
<phase>package</phase>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mirror = "https://github.com/stackabletech/spark.git"
2+
base = "f0bb2e6a47d0ebda424ffd633fcea8644a597954"

0 commit comments

Comments
 (0)