Default test task to Java 25 only, require explicit tasks for other JVMs

andimarek · claude · andi · commit 14af362c1a7b · 2026-03-11T10:07:33.000+10:00
Remove automatic dependencies that made `./gradlew test` run on all JVMs
(11, 17, 21, 25) and `check` pull in testng. Now `test` and `check` only
run on Java 25 by default. Other JVM versions are still available via
explicit tasks (testWithJava11, testWithJava17, etc.) used by CI matrix.

Simplifies CI workflow commands by removing all -x exclusion flags.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - gradle-argument: 'assemble && ./gradlew check -x test -x testng -x testngWithJava11 -x testngWithJava17 -x testngWithJava21'
+          - gradle-argument: 'assemble && ./gradlew check'
             label: 'check'
           - gradle-argument: 'testWithJava11 testngWithJava11'
             label: 'java11'
@@ -23,7 +23,7 @@ jobs:
           - gradle-argument: 'testWithJava21 testngWithJava21'
             label: 'java21'
             test-results-dirs: 'testWithJava21 testngWithJava21'
-          - gradle-argument: 'test -x testWithJava11 -x testWithJava17 -x testWithJava21 testng jacocoTestReport'
+          - gradle-argument: 'test testng jacocoTestReport'
             label: 'java25'
             test-results-dirs: 'test testng'
           - gradle-argument: 'jcstress'
@@ -220,4 +220,4 @@ jobs:
           java-version: '25'
           distribution: 'corretto'
       - name: publishToMavenCentral
-        run: ./gradlew assemble && ./gradlew check -x test -x testng -x testngWithJava11 -x testngWithJava17 -x testngWithJava21 --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace
+        run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - gradle-argument: 'assemble && ./gradlew check -x test -x testng -x testngWithJava11 -x testngWithJava17 -x testngWithJava21'
+          - gradle-argument: 'assemble && ./gradlew check'
             label: 'check'
           - gradle-argument: 'testWithJava11 testngWithJava11'
             label: 'java11'
@@ -31,7 +31,7 @@ jobs:
           - gradle-argument: 'testWithJava21 testngWithJava21'
             label: 'java21'
             test-results-dirs: 'testWithJava21 testngWithJava21'
-          - gradle-argument: 'test -x testWithJava11 -x testWithJava17 -x testWithJava21 testng jacocoTestReport'
+          - gradle-argument: 'test testng jacocoTestReport'
             label: 'java25'
             test-results-dirs: 'test testng'
           - gradle-argument: 'jcstress'
diff --git a/build.gradle b/build.gradle
@@ -406,8 +406,6 @@ task testng(type: Test) {
     dependsOn tasks.named('testClasses')
     doLast { verifyTestngSkips(it, expectedTestngSkips) }
 }
-check.dependsOn testng
-
 compileJava {
     options.compilerArgs += ["-parameters"]
     source file("build/generated-src"), sourceSets.main.java
@@ -563,9 +561,6 @@ tasks.register('testWithJava11', Test) {
     }
 }
 
-test.dependsOn testWithJava21
-test.dependsOn testWithJava17
-test.dependsOn testWithJava11
 
 jacoco {
     toolVersion = "0.8.12"

Original file line number	Diff line number	Diff line change
`@@ -406,8 +406,6 @@ task testng(type: Test) {`
`406`	`406`	`dependsOn tasks.named('testClasses')`
`407`	`407`	`doLast { verifyTestngSkips(it, expectedTestngSkips) }`
`408`	`408`	`}`
`409`		`-check.dependsOn testng`
`410`		`-`
`411`	`409`	`compileJava {`
`412`	`410`	`options.compilerArgs += ["-parameters"]`
`413`	`411`	`source file("build/generated-src"), sourceSets.main.java`
`@@ -563,9 +561,6 @@ tasks.register('testWithJava11', Test) {`
`563`	`561`	`}`
`564`	`562`	`}`
`565`	`563`
`566`		`-test.dependsOn testWithJava21`
`567`		`-test.dependsOn testWithJava17`
`568`		`-test.dependsOn testWithJava11`
`569`	`564`
`570`	`565`	`jacoco {`
`571`	`566`	`toolVersion = "0.8.12"`