Skip to content

Commit 20ded01

Browse files
committed
Revert "[SPARK-51953] Support Java 24"
This reverts commit bb43a3d.
1 parent 9a8fad9 commit 20ded01

File tree

7 files changed

+22
-29
lines changed

7 files changed

+22
-29
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, 24 ]
36+
java-version: [ 17, 21 ]
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:24-jre
25+
FROM azul/zulu-openjdk:21-jre
2626

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

build-tools/helm/spark-kubernetes-operator/values.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ operatorDeployment:
4343
operatorContainer:
4444
jvmArgs: "-Dfile.encoding=UTF8"
4545
env:
46-
- name: "SPARK_USER"
47-
value: "spark"
4846
envFrom:
4947
volumeMounts: { }
5048
resources:

build.gradle

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ subprojects {
5858

5959
repositories {
6060
mavenCentral()
61-
maven {
62-
url = "https://repository.apache.org/content/repositories/snapshots/"
63-
}
6461
}
6562

6663
apply plugin: 'checkstyle'
@@ -71,24 +68,22 @@ subprojects {
7168
showViolations = true
7269
}
7370

74-
if (JavaVersion.current() < JavaVersion.VERSION_24) {
75-
apply plugin: 'pmd'
76-
pmd {
77-
ruleSetFiles = files("$rootDir/config/pmd/ruleset.xml")
78-
toolVersion = libs.versions.pmd.get()
79-
consoleOutput = true
80-
ignoreFailures = false
81-
}
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+
}
8278

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

9489
apply plugin: 'jacoco'

docs/operations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ under the License.
1919

2020
### Compatibility
2121

22-
- Java 17, 21 and 24
22+
- Java 17 and 21
2323
- Kubernetes version compatibility:
2424
+ k8s version >= 1.30 is recommended. Operator attempts to be API compatible as possible, but
2525
patch support will not be performed on k8s versions that reached EOL.

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
# under the License.
1717
[versions]
1818
fabric8 = "7.2.0"
19-
lombok = "1.18.38"
19+
lombok = "1.18.32"
2020
operator-sdk = "4.9.0"
2121
okhttp = "4.12.0"
2222
dropwizard-metrics = "4.2.25"
23-
spark = "4.0.1-SNAPSHOT"
23+
spark = "4.0.0-preview2"
2424
log4j = "2.24.2"
2525

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

3232
# Build Analysis

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ fi
210210

211211

212212
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
213-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m" "--enable-native-access=ALL-UNNAMED"'
213+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
214214

215215
# Collect all arguments for the java command:
216216
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,

0 commit comments

Comments
 (0)