From 5acffd2d546af2b375b3a9889a0880671c9f7d43 Mon Sep 17 00:00:00 2001 From: Brendan Walsh Date: Wed, 12 Nov 2025 14:08:06 -0800 Subject: [PATCH 1/2] Add support for Spark 4.0 --- gradle/java-publication.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- isolation-forest-onnx/build.gradle | 2 +- isolation-forest/build.gradle | 14 ++++++++++++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/gradle/java-publication.gradle b/gradle/java-publication.gradle index bae2668..73ea875 100644 --- a/gradle/java-publication.gradle +++ b/gradle/java-publication.gradle @@ -7,13 +7,13 @@ def licenseSpec = copySpec { } task sourcesJar(type: Jar, dependsOn: classes) { - classifier 'sources' + archiveClassifier.set('sources') from sourceSets.main.allSource with licenseSpec } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier 'javadoc' + archiveClassifier.set('javadoc') from tasks.javadoc with licenseSpec } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..19cfad9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/isolation-forest-onnx/build.gradle b/isolation-forest-onnx/build.gradle index 88c4531..c73d610 100644 --- a/isolation-forest-onnx/build.gradle +++ b/isolation-forest-onnx/build.gradle @@ -128,4 +128,4 @@ clean { check.dependsOn test, runFlake8, runCoverage, runMypy build.dependsOn buildPythonPackage test.dependsOn(":isolation-forest:build") -runCoverage.dependsOn(":isolation-forest:build") \ No newline at end of file +runCoverage.dependsOn(":isolation-forest:build") diff --git a/isolation-forest/build.gradle b/isolation-forest/build.gradle index 75240a3..50d08d8 100644 --- a/isolation-forest/build.gradle +++ b/isolation-forest/build.gradle @@ -19,6 +19,20 @@ test { useTestNG() environment 'SPARK_VERSION', sparkVersion environment 'SCALA_VERSION_SHORT', scalaVersionShort + if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { + jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED', + '--add-opens=java.base/java.util=ALL-UNNAMED', + '--add-opens=java.base/java.util.concurrent=ALL-UNNAMED', + '--add-opens=java.base/java.io=ALL-UNNAMED', + '--add-opens=java.base/java.nio=ALL-UNNAMED', + '--add-opens=java.base/sun.nio.ch=ALL-UNNAMED', + '--add-opens=java.base/java.net=ALL-UNNAMED', + '--add-opens=java.base/sun.security.util=ALL-UNNAMED', + '--add-opens=java.base/java.lang.invoke=ALL-UNNAMED', + '--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED', + '--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED', + '--add-opens=java.base/sun.util.calendar=ALL-UNNAMED' + } } archivesBaseName = "${project.name}_${sparkVersion}_${scalaVersionShort}" From d6bba3da2805f1f5d50e66e9bac4d7f19e9f351f Mon Sep 17 00:00:00 2001 From: Brendan Walsh Date: Wed, 12 Nov 2025 15:04:03 -0800 Subject: [PATCH 2/2] Updated CI build to include spark 4.0 --- .github/workflows/ci.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2d3d29..41ce857 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,26 +23,40 @@ jobs: include: - scala-version: 2.12.19 spark-version: 2.4.3 + java-version: '1.8' - scala-version: 2.12.19 spark-version: 3.0.3 + java-version: '1.8' - scala-version: 2.12.19 spark-version: 3.1.3 + java-version: '1.8' - scala-version: 2.12.19 spark-version: 3.2.4 + java-version: '1.8' - scala-version: 2.13.14 spark-version: 3.2.4 + java-version: '1.8' - scala-version: 2.12.19 spark-version: 3.3.4 + java-version: '1.8' - scala-version: 2.13.14 spark-version: 3.3.4 + java-version: '1.8' - scala-version: 2.12.19 spark-version: 3.4.3 + java-version: '1.8' - scala-version: 2.13.14 spark-version: 3.4.3 + java-version: '1.8' - scala-version: 2.12.19 spark-version: 3.5.5 + java-version: '1.8' - scala-version: 2.13.14 spark-version: 3.5.5 + java-version: '1.8' + - scala-version: 2.13.14 + spark-version: 4.0.1 + java-version: '17' if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')" steps: - name: Check out code @@ -52,7 +66,7 @@ jobs: - name: Set up Java uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: ${{ matrix.java-version }} - name: Perform build env: SCALA_VERSION: ${{ matrix.scala-version }}