diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index b74a5f4..f146b81 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -21,7 +21,7 @@ jobs: run: shellcheck scripts/*.sh - uses: actions/setup-java@v5 with: - java-version: 21 + java-version: 25 distribution: temurin - uses: gradle/actions/setup-gradle@v4 - name: Run unit tests diff --git a/build.gradle b/build.gradle index cb763c7..5cf3207 100644 --- a/build.gradle +++ b/build.gradle @@ -15,17 +15,15 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind:2.20.0' compileOnly 'org.apache.spark:spark-sql_2.12:3.4.4' - testImplementation platform('org.junit:junit-bom:5.14.0') + testImplementation platform('org.junit:junit-bom:6.0.0') testImplementation 'org.junit.jupiter:junit-jupiter' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' testImplementation 'org.assertj:assertj-core:3.27.6' testImplementation 'org.mockito:mockito-core:5.20.0' } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(11) - } +compileJava { + options.release = 11 } test { @@ -75,7 +73,7 @@ spotless { } java { removeUnusedImports() - palantirJavaFormat('2.50.0').formatJavadoc(true) + palantirJavaFormat().formatJavadoc(true) formatAnnotations() licenseHeaderFile(file('license-header.txt')) } diff --git a/pmd-ruleset.xml b/pmd-ruleset.xml index 58ed2f0..9d7cef8 100644 --- a/pmd-ruleset.xml +++ b/pmd-ruleset.xml @@ -50,6 +50,12 @@ + + + + + +