diff --git a/.github/workflows/changelog-print.yml b/.github/workflows/changelog-print.yml index 88be1f9332..5bf4eff953 100644 --- a/.github/workflows/changelog-print.yml +++ b/.github/workflows/changelog-print.yml @@ -10,10 +10,9 @@ jobs: name: changelogPrint steps: - uses: actions/checkout@v4 - - name: jdk 11 - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 21 distribution: 'temurin' - name: gradle caching uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dba0ec1d89..9c8b21d662 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,11 +23,10 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Install JDK 11 - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: 11 + java-version: 21 - name: gradle caching uses: gradle/actions/setup-gradle@v4 - name: spotlessCheck @@ -41,33 +40,25 @@ jobs: matrix: kind: [maven, gradle] # Test on the latest Java version once Gradle & Maven support it. - jre: [11, 17, 21, 24] - os: [ubuntu-latest] + jre: [17, 21, 24] + os: [ubuntu-latest, windows-latest] include: - # test windows at the diagonals of the above matrix - - kind: maven - jre: 11 - os: windows-latest - - kind: gradle - jre: 17 - os: windows-latest # npm on linux only (crazy slow on windows) - kind: npm - jre: 11 + jre: 17 os: ubuntu-latest - kind: shfmt - jre: 11 + jre: 17 os: ubuntu-latest shfmt-version: v3.8.0 - kind: idea - jre: 11 + jre: 17 os: ubuntu-latest runs-on: ${{ matrix.os }} steps: - name: Checkout uses: actions/checkout@v4 - - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }} - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: "temurin" java-version: ${{ matrix.jre }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ffc164a461..684c2ba440 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,10 +38,9 @@ jobs: ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }} steps: - uses: actions/checkout@v4 - - name: jdk 11 - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - name: gradle caching uses: gradle/actions/setup-gradle@v4 diff --git a/CHANGES.md b/CHANGES.md index f4ac244ba4..c007fd1fce 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,8 @@ This document is intended for Spotless developers. We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`). ## [Unreleased] +### Changes +* **BREAKING** Bump the required Java to `17`. ([#2375](https://github.com/diffplug/spotless/issues/2375), [#2540](https://github.com/diffplug/spotless/pull/2540)) ## [3.3.0] - 2025-07-20 ### Added diff --git a/gradle.properties b/gradle.properties index fa9e23c117..8067684f37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,7 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8 org.gradle.parallel=true org.gradle.caching=true org.gradle.configuration-cache=true +org.gradle.configuration-cache.parallel=true name=spotless description=Spotless - keep your code spotless with Gradle @@ -32,4 +33,4 @@ VER_JGIT=6.10.1.202505221210-r VER_JUNIT=5.13.3 VER_ASSERTJ=3.27.3 VER_MOCKITO=5.18.0 -VER_SELFIE=2.5.3 \ No newline at end of file +VER_SELFIE=2.5.3 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baa..8bdaf60c75 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da476..407c905d9c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9367..ef07e0162b 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java index c2a1c4703f..811f811ee0 100644 --- a/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java +++ b/lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java @@ -15,11 +15,8 @@ */ package com.diffplug.spotless.extra.cpp; -import static org.junit.jupiter.api.condition.JRE.JAVA_17; - import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -33,7 +30,6 @@ public EclipseCdtFormatterStepTest() { @ParameterizedTest @MethodSource - @EnabledForJreRange(min = JAVA_17) void formatWithVersion(String version) throws Exception { harnessFor(version).test("main.c", "#include ;\nint main(int argc, \nchar *argv[]) {}", diff --git a/lib/build.gradle b/lib/build.gradle index 134f3285b5..a993f83e75 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,3 +1,5 @@ +import org.gradle.util.GradleVersion + plugins { id 'java-library' id 'io.github.davidburstrom.version-compatibility' @@ -148,6 +150,11 @@ tasks.withType(Test).configureEach { // https://docs.gradle.org/7.5/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED" } + + if (GradleVersion.current() >= GradleVersion.version('9.0')) { + // https://github.com/gradle/gradle/issues/33619 + failOnNoDiscoveredTests = false + } } jar { diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 0d89813e56..1058a76663 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -3,6 +3,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`). ## [Unreleased] +### Changed +* **BREAKING** Bump the required Gradle to `7.3` and required Java to `17`. ([#2375](https://github.com/diffplug/spotless/issues/2375), [#2540](https://github.com/diffplug/spotless/pull/2540)) ## [7.2.0] - 2025-07-20 ### Added diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java index 676bed0aea..3c5c4f3df2 100644 --- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java +++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/GroovyExtension.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 DiffPlug + * Copyright 2016-2025 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,8 @@ import javax.inject.Inject; import org.gradle.api.GradleException; -import org.gradle.api.internal.plugins.DslObject; import org.gradle.api.plugins.GroovyBasePlugin; import org.gradle.api.tasks.GroovySourceDirectorySet; -import org.gradle.api.tasks.GroovySourceSet; -import org.gradle.util.GradleVersion; import com.diffplug.spotless.generic.LicenseHeaderStep; @@ -66,12 +63,7 @@ protected void setupTask(SpotlessTask task) { target = getSources(getProject(), message, sourceSet -> { - if (GradleVersion.current().compareTo(GradleVersion.version(SpotlessPlugin.VER_GRADLE_javaPluginExtension)) >= 0) { - return sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class); - } else { - final GroovySourceSet groovySourceSet = new DslObject(sourceSet).getConvention().getPlugin(GroovySourceSet.class); - return groovySourceSet.getGroovy(); - } + return sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class); }, file -> { final String name = file.getName(); diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java index 1a9a06b986..99311deb1f 100644 --- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java +++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JvmLang.java @@ -1,5 +1,5 @@ /* - * Copyright 2023 DiffPlug + * Copyright 2023-2025 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,31 +22,20 @@ import org.gradle.api.Project; import org.gradle.api.file.FileCollection; import org.gradle.api.file.SourceDirectorySet; -import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.specs.Spec; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSetContainer; -import org.gradle.util.GradleVersion; interface JvmLang { default FileCollection getSources(Project project, String message, Function sourceSetSourceDirectory, Spec filterSpec) { - final SourceSetContainer sourceSets; FileCollection union = project.files(); - if (GradleVersion.current().compareTo(GradleVersion.version(SpotlessPlugin.VER_GRADLE_javaPluginExtension)) >= 0) { - final JavaPluginExtension javaPluginExtension = project.getExtensions().findByType(JavaPluginExtension.class); - if (javaPluginExtension == null) { - throw new GradleException(message); - } - sourceSets = javaPluginExtension.getSourceSets(); - } else { - final JavaPluginConvention javaPluginConvention = project.getConvention().findPlugin(JavaPluginConvention.class); - if (javaPluginConvention == null) { - throw new GradleException(message); - } - sourceSets = javaPluginConvention.getSourceSets(); + final JavaPluginExtension javaPluginExtension = project.getExtensions().findByType(JavaPluginExtension.class); + if (javaPluginExtension == null) { + throw new GradleException(message); } + final SourceSetContainer sourceSets = javaPluginExtension.getSourceSets(); for (SourceSet sourceSet : sourceSets) { union = union.plus(sourceSetSourceDirectory.apply(sourceSet).filter(filterSpec)); } diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java index 24bea9d90b..b9e3aeef16 100644 --- a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java +++ b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessPlugin.java @@ -27,10 +27,9 @@ public class SpotlessPlugin implements Plugin { static final String SPOTLESS_MODERN = "spotlessModern"; - static final String VER_GRADLE_min = "6.1.1"; - static final String VER_GRADLE_javaPluginExtension = "7.1"; + static final String VER_GRADLE_min = "7.3"; static final String VER_GRADLE_minVersionForCustom = "8.4"; - private static final int MINIMUM_JRE = 11; + private static final int MINIMUM_JRE = 17; @Override public void apply(Project project) { diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java index 21fef4bc27..9e1738a02e 100644 --- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java +++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java @@ -43,11 +43,14 @@ public class GradleIntegrationHarness extends ResourceHarness { public enum GradleVersionSupport { - JRE_11("5.0"), MINIMUM(SpotlessPlugin.VER_GRADLE_min), CUSTOM_STEPS(SpotlessPlugin.VER_GRADLE_minVersionForCustom), - // technically, this API exists in 6.5, but the flags for it change in 6.6, so we build to that - CONFIGURATION_CACHE("6.6"), + MINIMUM(SpotlessPlugin.VER_GRADLE_min), + // https://docs.gradle.org/7.5/userguide/configuration_cache.html#config_cache:stable - STABLE_CONFIGURATION_CACHE("7.5"); + STABLE_CONFIGURATION_CACHE("7.5"), + + CUSTOM_STEPS(SpotlessPlugin.VER_GRADLE_minVersionForCustom), + + ; final String version; @@ -77,18 +80,6 @@ public enum GradleVersionSupport { case 18: minVersionForRunningJRE = "7.5"; break; - case 17: - minVersionForRunningJRE = "7.3"; - break; - case 16: - minVersionForRunningJRE = "7.0"; - break; - case 15: - minVersionForRunningJRE = "6.7"; - break; - case 14: - minVersionForRunningJRE = "6.3"; - break; default: minVersionForRunningJRE = null; break; diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java index 94ecf6c076..b1d7666e00 100644 --- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java +++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NativeCmdIntegrationTest.java @@ -53,7 +53,7 @@ class NativeCmdWithConfigCacheTest extends GradleIntegrationHarness implements N public GradleRunner gradleRunner() throws IOException { setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true", "org.gradle.configuration-cache=true"); - return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version); + return super.gradleRunner(); } } } diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java index a427d6f2ec..ec35e2e446 100644 --- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java +++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/SpotlessPluginRedirectTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 DiffPlug + * Copyright 2020-2025 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,13 +15,10 @@ */ package com.diffplug.gradle.spotless; -import static org.junit.jupiter.api.condition.JRE.JAVA_11; - import java.io.IOException; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledForJreRange; import com.diffplug.common.base.StringPrinter; @@ -39,35 +36,4 @@ void redirectPluginModernGradle() throws IOException { " To migrate:", " - Test your build with: id 'com.diffplug.gradle.spotless' version '4.5.1'")); } - - @Test - @EnabledForJreRange(max = JAVA_11) - void redirectPluginOldGradle() throws IOException { - setFile("build.gradle").toLines( - "plugins {", - " id 'com.diffplug.gradle.spotless'", - "}"); - Assertions.assertThat(gradleRunner().withGradleVersion(GradleVersionSupport.JRE_11.version) - .buildAndFail().getOutput().replace("\r", "")) - .contains(StringPrinter.buildStringFromLines( - "> Failed to apply plugin [id 'com.diffplug.gradle.spotless']", - " > We have moved from 'com.diffplug.gradle.spotless'", - " to 'com.diffplug.spotless'", - " To migrate:", - " - Upgrade Gradle to 6.1.1 or newer (you're on 5.0)", - " - Test your build with: id 'com.diffplug.gradle.spotless' version '4.5.1'")); - } - - @Test - @EnabledForJreRange(max = JAVA_11) - void realPluginOldGradle() throws IOException { - setFile("build.gradle").toLines( - "plugins {", - " id 'com.diffplug.spotless'", - "}"); - Assertions.assertThat(gradleRunner().withGradleVersion(GradleVersionSupport.JRE_11.version) - .buildAndFail().getOutput().replace("\r", "")) - .contains(StringPrinter.buildStringFromLines( - "Spotless requires Gradle 6.1.1 or newer, this was 5.0")); - } } diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index b91be43d79..751641aed6 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -3,6 +3,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`). ## [Unreleased] +### Changes +* **BREAKING** Bump the required Java to `17`. ([#2375](https://github.com/diffplug/spotless/issues/2375), [#2540](https://github.com/diffplug/spotless/pull/2540)) ## [2.46.0] - 2025-07-20 ### Added diff --git a/testlib/build.gradle b/testlib/build.gradle index 2d10006a60..efea285f8d 100644 --- a/testlib/build.gradle +++ b/testlib/build.gradle @@ -7,7 +7,7 @@ apply from: rootProject.file('gradle/java-setup.gradle') dependencies { api projects.lib - api files(projects.lib.dependencyProject.sourceSets.sortPom.output.classesDirs) + api files(project(projects.lib.path).sourceSets.sortPom.output.classesDirs) api "com.diffplug.durian:durian-core:${VER_DURIAN}" api "com.diffplug.durian:durian-testlib:${VER_DURIAN}" api "org.junit.jupiter:junit-jupiter:${VER_JUNIT}" diff --git a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java index 1ba0a745ee..47efe759cc 100644 --- a/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java +++ b/testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2024 DiffPlug + * Copyright 2016-2025 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -82,7 +82,7 @@ private static Provisioner createWithRepositories(Consumer re return config.resolve(); } catch (ResolveException e) { /* Provide Maven coordinates in exception message instead of static string 'detachedConfiguration' */ - throw new ResolveException(config.getDescription(), e); + throw new RuntimeException("Error resolving configuration: " + config.getDescription(), e); } finally { // delete the temp dir try { diff --git a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java index edfae1ac76..72e470cf05 100644 --- a/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/java/GoogleJavaFormatStepTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2024 DiffPlug + * Copyright 2016-2025 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ */ package com.diffplug.spotless.java; -import static org.junit.jupiter.api.condition.JRE.JAVA_13; import static org.junit.jupiter.api.condition.JRE.JAVA_15; import static org.junit.jupiter.api.condition.JRE.JAVA_20; import static org.junit.jupiter.api.condition.JRE.JAVA_21; @@ -33,7 +32,6 @@ class GoogleJavaFormatStepTest extends ResourceHarness { @Test - @EnabledForJreRange(min = JAVA_13) void jvm13Features() throws Exception { try (StepHarness step = StepHarness.forStep(GoogleJavaFormatStep.create(TestProvisioner.mavenCentral()))) { step.testResource("java/googlejavaformat/TextBlock.dirty", "java/googlejavaformat/TextBlock.clean"); diff --git a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java index 6e197dc8fa..642341cbc0 100644 --- a/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/java/PalantirJavaFormatStepTest.java @@ -15,10 +15,7 @@ */ package com.diffplug.spotless.java; -import static org.junit.jupiter.api.condition.JRE.JAVA_13; - import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledForJreRange; import com.diffplug.spotless.FormatterStep; import com.diffplug.spotless.ResourceHarness; @@ -29,7 +26,6 @@ class PalantirJavaFormatStepTest extends ResourceHarness { @Test - @EnabledForJreRange(min = JAVA_13) void jvm13Features() throws Exception { try (StepHarness step = StepHarness.forStep(PalantirJavaFormatStep.create(TestProvisioner.mavenCentral()))) { step.testResource("java/palantirjavaformat/TextBlock.dirty", "java/palantirjavaformat/TextBlock.clean"); diff --git a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java index 844b2cf36b..6257f10cb2 100644 --- a/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java +++ b/testlib/src/test/java/com/diffplug/spotless/rdf/RdfFormatterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2024 DiffPlug + * Copyright 2024-2025 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,6 @@ */ package com.diffplug.spotless.rdf; -import static org.junit.jupiter.api.condition.JRE.JAVA_17; - import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; @@ -27,7 +25,6 @@ import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledForJreRange; import org.junit.jupiter.params.provider.Arguments; import org.opentest4j.AssertionFailedError; @@ -52,7 +49,6 @@ private static FormatterStep forTurtleFormatterVersionAndStyle(String version, M public RdfFormatterTest() {} @Test - @EnabledForJreRange(min = JAVA_17) void testTurtleFormatter_1_2_12_DefaultStyle() throws IOException, ClassNotFoundException { String inputDir = "/rdf/ttl/input/"; String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-default/"; @@ -60,7 +56,6 @@ void testTurtleFormatter_1_2_12_DefaultStyle() throws IOException, ClassNotFound } @Test - @EnabledForJreRange(min = JAVA_17) void testTurtleFormatter_1_2_12_style01() throws IOException, ClassNotFoundException { String inputDir = "/rdf/ttl/input/"; String expectedOutputDir = "/rdf/ttl/expected/v1.2.12-style01/";