Skip to content

Commit 68a14ff

Browse files
committed
[SPARK-51953] Support Java 24
1 parent 50b31f4 commit 68a14ff

File tree

5 files changed

+22
-19
lines changed

5 files changed

+22
-19
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
fail-fast: false
3434
matrix:
3535
os: [ 'ubuntu-latest', 'ubuntu-24.04-arm' ]
36-
java-version: [ 17, 21 ]
36+
java-version: [ 17, 21, 24 ]
3737
steps:
3838
- name: Checkout repository
3939
uses: actions/checkout@v3

build-tools/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ COPY . .
2222

2323
RUN --mount=type=cache,target=/home/gradle/.gradle/caches gradle --no-daemon clean build -x check
2424

25-
FROM azul/zulu-openjdk:21-jre
25+
FROM azul/zulu-openjdk:24-jre
2626

2727
ARG APP_VERSION=0.1.0-SNAPSHOT
2828
ARG SPARK_UID=185

build.gradle

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,24 @@ subprojects {
6868
showViolations = true
6969
}
7070

71-
apply plugin: 'pmd'
72-
pmd {
73-
ruleSetFiles = files("$rootDir/config/pmd/ruleset.xml")
74-
toolVersion = libs.versions.pmd.get()
75-
consoleOutput = true
76-
ignoreFailures = false
77-
}
71+
if (JavaVersion.current() < JavaVersion.VERSION_24) {
72+
apply plugin: 'pmd'
73+
pmd {
74+
ruleSetFiles = files("$rootDir/config/pmd/ruleset.xml")
75+
toolVersion = libs.versions.pmd.get()
76+
consoleOutput = true
77+
ignoreFailures = false
78+
}
7879

79-
apply plugin: 'com.github.spotbugs'
80-
spotbugs {
81-
toolVersion = libs.versions.spotbugs.tool.get()
82-
afterEvaluate {
83-
reportsDir = file("${project.reporting.baseDir}/findbugs")
80+
apply plugin: 'com.github.spotbugs'
81+
spotbugs {
82+
toolVersion = libs.versions.spotbugs.tool.get()
83+
afterEvaluate {
84+
reportsDir = file("${project.reporting.baseDir}/findbugs")
85+
}
86+
excludeFilter = file("$rootDir/config/spotbugs/spotbugs_exclude.xml")
87+
ignoreFailures = false
8488
}
85-
excludeFilter = file("$rootDir/config/spotbugs/spotbugs_exclude.xml")
86-
ignoreFailures = false
8789
}
8890

8991
apply plugin: 'jacoco'

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717
[versions]
1818
fabric8 = "7.1.0"
19-
lombok = "1.18.32"
19+
lombok = "1.18.38"
2020
operator-sdk = "4.9.0"
2121
okhttp = "4.12.0"
2222
dropwizard-metrics = "4.2.25"
@@ -25,8 +25,8 @@ log4j = "2.24.2"
2525

2626
# Test
2727
junit = "5.10.2"
28-
jacoco = "0.8.12"
29-
mockito = "5.11.0"
28+
jacoco = "0.8.13"
29+
mockito = "5.17.0"
3030
powermock = "2.0.9"
3131

3232
# Build Analysis

tests/e2e/watched-namespaces/spark-example.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ spec:
2727
spark.executor.instances: "1"
2828
spark.kubernetes.container.image: "apache/spark:4.0.0-preview2-scala2.13-java17-ubuntu"
2929
spark.kubernetes.authenticate.driver.serviceAccountName: "spark"
30+
spark.kubernetes.driverEnv.SPARK_USER: "spark"
3031
spark.kubernetes.driver.request.cores: "0.5"
3132
spark.kubernetes.executor.request.cores: "0.5"
3233
runtimeVersions:

0 commit comments

Comments
 (0)