This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-0.1
in repository https://gitbox.apache.org/repos/asf/spark-kubernetes-operator.git
The following commit(s) were added to refs/heads/branch-0.1 by this push:
new 20ded01 Revert "[SPARK-51953] Support Java 24"
20ded01 is described below
commit 20ded01f0d47c47dfa2952ea691849451646b1c3
Author: Dongjoon Hyun <dongj...@apache.org>
AuthorDate: Sun May 4 10:41:04 2025 -0700
Revert "[SPARK-51953] Support Java 24"
This reverts commit bb43a3da991238432ea5bb5406e1ba93a7ba9c35.
---
.github/workflows/build_and_test.yml | 2 +-
build-tools/docker/Dockerfile | 2 +-
.../helm/spark-kubernetes-operator/values.yaml | 2 --
build.gradle | 33 +++++++++-------------
docs/operations.md | 2 +-
gradle/libs.versions.toml | 8 +++---
gradlew | 2 +-
7 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index eb22974..cbb2818 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
os: [ 'ubuntu-latest', 'ubuntu-24.04-arm' ]
- java-version: [ 17, 21, 24 ]
+ java-version: [ 17, 21 ]
steps:
- name: Checkout repository
uses: actions/checkout@v3
diff --git a/build-tools/docker/Dockerfile b/build-tools/docker/Dockerfile
index 725f559..5f6a92f 100644
--- a/build-tools/docker/Dockerfile
+++ b/build-tools/docker/Dockerfile
@@ -22,7 +22,7 @@ COPY . .
RUN --mount=type=cache,target=/home/gradle/.gradle/caches gradle --no-daemon
clean build -x check
-FROM azul/zulu-openjdk:24-jre
+FROM azul/zulu-openjdk:21-jre
ARG APP_VERSION=0.1.0-SNAPSHOT
ARG SPARK_UID=185
diff --git a/build-tools/helm/spark-kubernetes-operator/values.yaml
b/build-tools/helm/spark-kubernetes-operator/values.yaml
index 53c387e..85ff211 100644
--- a/build-tools/helm/spark-kubernetes-operator/values.yaml
+++ b/build-tools/helm/spark-kubernetes-operator/values.yaml
@@ -43,8 +43,6 @@ operatorDeployment:
operatorContainer:
jvmArgs: "-Dfile.encoding=UTF8"
env:
- - name: "SPARK_USER"
- value: "spark"
envFrom:
volumeMounts: { }
resources:
diff --git a/build.gradle b/build.gradle
index 223c7e9..8ba7343 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,9 +58,6 @@ subprojects {
repositories {
mavenCentral()
- maven {
- url = "https://repository.apache.org/content/repositories/snapshots/";
- }
}
apply plugin: 'checkstyle'
@@ -71,24 +68,22 @@ subprojects {
showViolations = true
}
- if (JavaVersion.current() < JavaVersion.VERSION_24) {
- apply plugin: 'pmd'
- pmd {
- ruleSetFiles = files("$rootDir/config/pmd/ruleset.xml")
- toolVersion = libs.versions.pmd.get()
- consoleOutput = true
- ignoreFailures = false
- }
+ apply plugin: 'pmd'
+ pmd {
+ ruleSetFiles = files("$rootDir/config/pmd/ruleset.xml")
+ toolVersion = libs.versions.pmd.get()
+ consoleOutput = true
+ ignoreFailures = false
+ }
- apply plugin: 'com.github.spotbugs'
- spotbugs {
- toolVersion = libs.versions.spotbugs.tool.get()
- afterEvaluate {
- reportsDir = file("${project.reporting.baseDir}/findbugs")
- }
- excludeFilter = file("$rootDir/config/spotbugs/spotbugs_exclude.xml")
- ignoreFailures = false
+ apply plugin: 'com.github.spotbugs'
+ spotbugs {
+ toolVersion = libs.versions.spotbugs.tool.get()
+ afterEvaluate {
+ reportsDir = file("${project.reporting.baseDir}/findbugs")
}
+ excludeFilter = file("$rootDir/config/spotbugs/spotbugs_exclude.xml")
+ ignoreFailures = false
}
apply plugin: 'jacoco'
diff --git a/docs/operations.md b/docs/operations.md
index 4cef2b4..b39f84b 100644
--- a/docs/operations.md
+++ b/docs/operations.md
@@ -19,7 +19,7 @@ under the License.
### Compatibility
-- Java 17, 21 and 24
+- Java 17 and 21
- Kubernetes version compatibility:
+ k8s version >= 1.30 is recommended. Operator attempts to be API
compatible as possible, but
patch support will not be performed on k8s versions that reached EOL.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fedd8a4..5c59899 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,17 +16,17 @@
# under the License.
[versions]
fabric8 = "7.2.0"
-lombok = "1.18.38"
+lombok = "1.18.32"
operator-sdk = "4.9.0"
okhttp = "4.12.0"
dropwizard-metrics = "4.2.25"
-spark = "4.0.1-SNAPSHOT"
+spark = "4.0.0-preview2"
log4j = "2.24.2"
# Test
junit = "5.10.2"
-jacoco = "0.8.13"
-mockito = "5.17.0"
+jacoco = "0.8.12"
+mockito = "5.11.0"
powermock = "2.0.9"
# Build Analysis
diff --git a/gradlew b/gradlew
index 118b4ab..21bed9b 100755
--- a/gradlew
+++ b/gradlew
@@ -210,7 +210,7 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m" "--enable-native-access=ALL-UNNAMED"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not
allowed to contain shell fragments,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
