Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/java-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
jvm: [17, 21]
jvm: [11, 17, 21]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand All @@ -109,7 +109,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
jvm: [17, 21]
jvm: [11, 17, 21]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand Down
8 changes: 6 additions & 2 deletions spark/v4.0/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ String sparkMajorVersion = '4.0'
String scalaVersion = '2.13'

JavaVersion javaVersion = JavaVersion.current()
if (javaVersion != JavaVersion.VERSION_17 && javaVersion != JavaVersion.VERSION_21) {
throw new GradleException("Spark 4.0 build requires JDK 17 or 21 but was executed with JDK " + javaVersion)
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 = [
Expand All @@ -32,6 +33,9 @@ def sparkProjects = [
]

configure(sparkProjects) {
tasks.configureEach {
onlyIf { javaVersionSupported }
}
configurations {
all {
resolutionStrategy {
Expand Down