This is an automated email from the ASF dual-hosted git repository.
huaxingao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new acc2c665bf Spark: Remove Spark 4.x Java version skip guards (#15737)
acc2c665bf is described below
commit acc2c665bf924965bb5408a1d33a88766156fa27
Author: Manu Zhang <[email protected]>
AuthorDate: Tue Mar 24 00:59:08 2026 +0800
Spark: Remove Spark 4.x Java version skip guards (#15737)
---
spark/v4.0/build.gradle | 9 ---------
spark/v4.1/build.gradle | 9 ---------
2 files changed, 18 deletions(-)
diff --git a/spark/v4.0/build.gradle b/spark/v4.0/build.gradle
index 90996f8c6f..acc4d7529f 100644
--- a/spark/v4.0/build.gradle
+++ b/spark/v4.0/build.gradle
@@ -20,12 +20,6 @@
String sparkMajorVersion = '4.0'
String scalaVersion = '2.13'
-JavaVersion javaVersion = JavaVersion.current()
-Boolean javaVersionSupported = javaVersion == JavaVersion.VERSION_17 ||
javaVersion == JavaVersion.VERSION_21
-if (!javaVersionSupported) {
- logger.warn("Skip Spark 4.0 build which requires JDK 17 or 21 but was
executed with JDK " + javaVersion)
-}
-
def sparkProjects = [
project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}"),
project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}"),
@@ -33,9 +27,6 @@ def sparkProjects = [
]
configure(sparkProjects) {
- tasks.configureEach {
- onlyIf { javaVersionSupported }
- }
configurations {
all {
resolutionStrategy {
diff --git a/spark/v4.1/build.gradle b/spark/v4.1/build.gradle
index a6b03f7e37..6a46cb4b20 100644
--- a/spark/v4.1/build.gradle
+++ b/spark/v4.1/build.gradle
@@ -20,12 +20,6 @@
String sparkMajorVersion = '4.1'
String scalaVersion = '2.13'
-JavaVersion javaVersion = JavaVersion.current()
-Boolean javaVersionSupported = javaVersion == JavaVersion.VERSION_17 ||
javaVersion == JavaVersion.VERSION_21
-if (!javaVersionSupported) {
- logger.warn("Skip Spark 4.1 build which requires JDK 17 or 21 but was
executed with JDK " + javaVersion)
-}
-
def sparkProjects = [
project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}"),
project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}"),
@@ -33,9 +27,6 @@ def sparkProjects = [
]
configure(sparkProjects) {
- tasks.configureEach {
- onlyIf { javaVersionSupported }
- }
configurations {
all {
resolutionStrategy {
