Skip to content

Commit 86f5037

Browse files
authored
chore(spark): update versions for 24.11 (#848)
* chore(spark): update versions for 24.11 * Update CHANGELOG.md * update patch stacks
1 parent ee387a8 commit 86f5037

File tree

5 files changed

+41
-82
lines changed

5 files changed

+41
-82
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
1414
- hive: Add version `4.0.0` ([#818]).
1515
- trino: Add version `455` ([#822]).
1616
- trino-cli: Add version `455` ([#822]).
17+
- spark: Add version `3.5.2` ([#848]).
1718

1819
### Changed
1920

@@ -30,6 +31,7 @@ All notable changes to this project will be documented in this file.
3031
- trino-cli: Remove version `451` ([#822]).
3132
- hbase: Remove 2.4.17 ([#846]).
3233
- omid: Remove 1.1.0 and 1.1.1 ([#846]).
34+
- spark: Remove 3.4.2 and 3.4.3 ([#848]).
3335

3436
### Fixed
3537

@@ -45,6 +47,7 @@ All notable changes to this project will be documented in this file.
4547
[#819]: https://github.com/stackabletech/docker-images/pull/819
4648
[#822]: https://github.com/stackabletech/docker-images/pull/822
4749
[#846]: https://github.com/stackabletech/docker-images/pull/846
50+
[#848]: https://github.com/stackabletech/docker-images/pull/848
4851

4952
## [24.7.0] - 2024-07-24
5053

spark-k8s/stackable/patches/3.4.2/001-cyclonedx-plugin.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

spark-k8s/stackable/patches/3.4.3/001-cyclonedx-plugin.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
2+
index ef7c010..0f4c1c7 100755
3+
--- a/dev/make-distribution.sh
4+
+++ b/dev/make-distribution.sh
5+
@@ -171,7 +171,6 @@ BUILD_COMMAND=("$MVN" clean package \
6+
-Dmaven.javadoc.skip=true \
7+
-Dmaven.scaladoc.skip=true \
8+
-Dmaven.source.skip \
9+
- -Dcyclonedx.skip=true \
10+
$@)
11+
12+
# Actually build the jar
13+
diff --git a/pom.xml b/pom.xml
14+
index 0f504db..6cca7db 100644
15+
--- a/pom.xml
16+
+++ b/pom.xml
17+
@@ -3482,7 +3482,12 @@
18+
<plugin>
19+
<groupId>org.cyclonedx</groupId>
20+
<artifactId>cyclonedx-maven-plugin</artifactId>
21+
- <version>2.7.9</version>
22+
+ <version>2.8.0</version>
23+
+ <configuration>
24+
+ <projectType>application</projectType>
25+
+ <schemaVersion>1.5</schemaVersion>
26+
+ <skipNotDeployed>false</skipNotDeployed>
27+
+ </configuration>
28+
<executions>
29+
<execution>
30+
<phase>package</phase>

spark-k8s/versions.py

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,22 @@
11
versions = [
22
{
3-
"product": "3.4.2",
4-
"java-base": "11",
5-
"java-devel": "11",
6-
"python": "3.11",
7-
"hadoop_long_version": "3.3.4", # https://github.com/apache/spark/blob/1db2f5c36b120c213432fc658c9fd24fc73cb45e/pom.xml#L122
8-
"aws_java_sdk_bundle": "1.12.262", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.4
9-
"azure_storage": "7.0.1", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.3.4
10-
"azure_keyvault_core": "1.0.0", # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
11-
"jackson_dataformat_xml": "2.14.2", # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.4.2
12-
"stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.2
13-
"woodstox_core": "6.5.0", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.2
14-
"vector": "0.40.1",
15-
"jmx_exporter": "1.0.1",
16-
"tini": "0.19.0",
17-
},
18-
{
19-
"product": "3.4.3",
20-
"java-base": "11",
21-
"java-devel": "11",
3+
"product": "3.5.1",
4+
"java-base": "17",
5+
"java-devel": "17",
226
"python": "3.11",
23-
"hadoop_long_version": "3.3.4", # https://github.com/apache/spark/blob/1db2f5c36b120c213432fc658c9fd24fc73cb45e/pom.xml#L122
7+
"hadoop_long_version": "3.3.4", # https://github.com/apache/spark/blob/6a5747d66e53ed0d934cdd9ca5c9bd9fde6868e6/pom.xml#L125
248
"aws_java_sdk_bundle": "1.12.262", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.4
259
"azure_storage": "7.0.1", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.3.4
2610
"azure_keyvault_core": "1.0.0", # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
27-
"jackson_dataformat_xml": "2.14.2", # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.4.3
28-
"stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.2
29-
"woodstox_core": "6.5.0", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.2
11+
"jackson_dataformat_xml": "2.15.2", # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.1
12+
"stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
13+
"woodstox_core": "6.5.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
3014
"vector": "0.40.1",
3115
"jmx_exporter": "1.0.1",
3216
"tini": "0.19.0",
3317
},
3418
{
35-
"product": "3.5.1",
19+
"product": "3.5.2",
3620
"java-base": "17",
3721
"java-devel": "17",
3822
"python": "3.11",

0 commit comments

Comments
 (0)