Skip to content

Commit ab75d68

Browse files
authored
chore: add spark 3.5.6 (#1142)
* chore: bump spark version to 3.5.6 * chore: update spark-connect-client to 3.5.6 * update changelog * update pr no * fix typo * fix md lint
1 parent efbc87d commit ab75d68

File tree

5 files changed

+64
-1
lines changed

5 files changed

+64
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ All notable changes to this project will be documented in this file.
4848
- kafka: Add `4.0.0` ([#1117])
4949
- Include `.tar.gz` snapshots of the product source code in container images ([#1126])
5050
- airflow: OPA authorizer for Airflow 3.x ([#1127])
51+
- spark-k8s: Add `3.5.6` ([#1142])
52+
- spark-connect-client: Add `3.5.6` ([#1142])
5153
- git-sync: Bump version to 4.4.1 ([#1151]).
5254

5355
### Changed
@@ -111,6 +113,7 @@ All notable changes to this project will be documented in this file.
111113
- druid: Remove `30.0.0` ([#1110]).
112114
- nifi: Remove `2.2.0` ([#1114]).
113115
- kafka: Remove `3.7.1` and `3.8.0` ([#1117])
116+
- spark-connect-client: Remove `3.5.5` ([#1142])
114117

115118
[nifi-iceberg-bundle]: https://github.com/stackabletech/nifi-iceberg-bundle
116119
[#1025]: https://github.com/stackabletech/docker-images/pull/1025
@@ -165,6 +168,7 @@ All notable changes to this project will be documented in this file.
165168
[#1137]: https://github.com/stackabletech/docker-images/pull/1137
166169
[#1138]: https://github.com/stackabletech/docker-images/pull/1138
167170
[#1139]: https://github.com/stackabletech/docker-images/pull/1139
171+
[#1142]: https://github.com/stackabletech/docker-images/pull/1142
168172
[#1151]: https://github.com/stackabletech/docker-images/pull/1151
169173
[#1152]: https://github.com/stackabletech/docker-images/pull/1152
170174

spark-connect-client/versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
versions = [
22
{
3-
"product": "3.5.5",
3+
"product": "3.5.6",
44
"spark-k8s": "3.5.5",
55
"java-base": "17",
66
"python": "3.11",
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 94ccf32b4d0eb7c3191b4e5a646605e7386c39ff Mon Sep 17 00:00:00 2001
2+
From: Razvan-Daniel Mihai <[email protected]>
3+
Date: Tue, 11 Mar 2025 17:29:39 +0200
4+
Subject: Update CycloneDX plugin
5+
6+
---
7+
dev/make-distribution.sh | 1 -
8+
pom.xml | 7 ++++++-
9+
2 files changed, 6 insertions(+), 2 deletions(-)
10+
11+
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
12+
index ef7c010e93..0f4c1c74e4 100755
13+
--- a/dev/make-distribution.sh
14+
+++ b/dev/make-distribution.sh
15+
@@ -171,7 +171,6 @@ BUILD_COMMAND=("$MVN" clean package \
16+
-Dmaven.javadoc.skip=true \
17+
-Dmaven.scaladoc.skip=true \
18+
-Dmaven.source.skip \
19+
- -Dcyclonedx.skip=true \
20+
$@)
21+
22+
# Actually build the jar
23+
diff --git a/pom.xml b/pom.xml
24+
index 68e2c422a2..6216ebb08e 100644
25+
--- a/pom.xml
26+
+++ b/pom.xml
27+
@@ -3534,7 +3534,12 @@
28+
<plugin>
29+
<groupId>org.cyclonedx</groupId>
30+
<artifactId>cyclonedx-maven-plugin</artifactId>
31+
- <version>2.7.9</version>
32+
+ <version>2.8.0</version>
33+
+ <configuration>
34+
+ <projectType>application</projectType>
35+
+ <schemaVersion>1.5</schemaVersion>
36+
+ <skipNotDeployed>false</skipNotDeployed>
37+
+ </configuration>
38+
<executions>
39+
<execution>
40+
<phase>package</phase>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
base = "303c18c74664f161b9b969ac343784c088b47593"

spark-k8s/versions.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,22 @@
1717
"tini": "0.19.0",
1818
"hbase_connector": "1.0.1",
1919
},
20+
{
21+
"product": "3.5.6",
22+
"java-base": "17",
23+
"java-devel": "17",
24+
"python": "3.11",
25+
"hadoop": "3.4.1", # Current Stackable LTS version. Source of the AWS and Azure artifacts to Spark's classpath.
26+
"hbase": "2.6.2", # Current Stackable LTS version. Used to build the HBase connector.
27+
"aws_java_sdk_bundle": "2.24.6", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.1
28+
"azure_storage": "7.0.1", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.4.1
29+
"azure_keyvault_core": "1.0.0", # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
30+
"jackson_dataformat_xml": "2.15.2", # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.2
31+
"stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
32+
"woodstox_core": "6.5.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
33+
"vector": "0.46.1",
34+
"jmx_exporter": "1.2.0",
35+
"tini": "0.19.0",
36+
"hbase_connector": "1.0.1",
37+
},
2038
]

0 commit comments

Comments
 (0)