Consistently declare JSpecify as a transitive compile-time dependency (#4703)

marcphilipp · web-flow · commit 7dc279167e80 · 2025-07-01T08:45:26.000Z
Prior to this commit this was only done in `junit-platform-commons`
which all other modules depend on. Therefore, JSpecify was already a
transitive compile-time dependency of all modules but their module
descriptors listed it as an non-transitive compile-time dependency.
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
@@ -55,6 +55,8 @@ dependencies {
 		because("Jupiter API is used in src/main/java")
 	}
 
+	compileOnlyApi(libs.jspecify)
+
 	// Pull in all "modular projects" to ensure that they are included
 	// in reports generated by the ApiReportGenerator.
 	modularProjects.forEach { apiReport(it) }
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 	api(projects.junitPlatformCommons)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	compileOnly(kotlin("stdlib"))
 
diff --git a/junit-jupiter-api/src/main/java/module-info.java b/junit-jupiter-api/src/main/java/module-info.java
@@ -16,7 +16,7 @@
 module org.junit.jupiter.api {
 
 	requires static transitive org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires transitive org.junit.platform.commons;
 	requires transitive org.opentest4j;
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 	api(projects.junitJupiterApi)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-jupiter-engine/src/main/java/module-info.java b/junit-jupiter-engine/src/main/java/module-info.java
@@ -20,7 +20,7 @@
 module org.junit.jupiter.engine {
 
 	requires static org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires org.junit.jupiter.api;
 	requires org.junit.platform.commons;
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 	api(projects.junitJupiterApi)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)
diff --git a/junit-jupiter-migrationsupport/src/main/java/module-info.java b/junit-jupiter-migrationsupport/src/main/java/module-info.java
@@ -16,7 +16,7 @@
 module org.junit.jupiter.migrationsupport {
 
 	requires static transitive org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires transitive junit; // 4
 	requires transitive org.junit.jupiter.api;
diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 	api(projects.junitJupiterApi)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	shadowed(libs.fastcsv)
 
diff --git a/junit-jupiter-params/src/main/java/module-info.java b/junit-jupiter-params/src/main/java/module-info.java
@@ -16,7 +16,7 @@
 module org.junit.jupiter.params {
 
 	requires static transitive org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires transitive org.junit.jupiter.api;
 	requires transitive org.junit.platform.commons;
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	api(projects.junitPlatformReporting)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	shadowed(libs.picocli)
 
diff --git a/junit-platform-console/src/main/java/module-info.java b/junit-platform-console/src/main/java/module-info.java
@@ -17,7 +17,7 @@
 module org.junit.platform.console {
 
 	requires static org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires org.junit.platform.commons;
 	requires org.junit.platform.engine;
diff --git a/junit-platform-engine/src/main/java/module-info.java b/junit-platform-engine/src/main/java/module-info.java
@@ -19,7 +19,7 @@
 module org.junit.platform.engine {
 
 	requires static transitive org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires transitive org.junit.platform.commons;
 	requires transitive org.opentest4j;
diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
 	api(projects.junitPlatformEngine)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	osgiVerification(projects.junitJupiterEngine)
 }
diff --git a/junit-platform-launcher/src/main/java/module-info.java b/junit-platform-launcher/src/main/java/module-info.java
@@ -24,7 +24,7 @@
 module org.junit.platform.launcher {
 
 	requires static transitive org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 	requires static jdk.jfr;
 
 	requires transitive java.logging;
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 	implementation(libs.openTestReporting.tooling.spi)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	shadowed(libs.openTestReporting.events)
 
diff --git a/junit-platform-reporting/src/main/java/module-info.java b/junit-platform-reporting/src/main/java/module-info.java
@@ -16,7 +16,7 @@
 module org.junit.platform.reporting {
 
 	requires static transitive org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires java.xml;
 	requires org.junit.platform.commons;
diff --git a/junit-platform-suite-api/junit-platform-suite-api.gradle.kts b/junit-platform-suite-api/junit-platform-suite-api.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 	api(projects.junitPlatformCommons)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)
diff --git a/junit-platform-suite-api/src/main/java/module-info.java b/junit-platform-suite-api/src/main/java/module-info.java
@@ -16,7 +16,7 @@
 module org.junit.platform.suite.api {
 
 	requires static transitive org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires transitive org.junit.platform.commons;
 
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
 	api(projects.junitPlatformSuiteApi)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	implementation(projects.junitPlatformLauncher)
 
diff --git a/junit-platform-suite-engine/src/main/java/module-info.java b/junit-platform-suite-engine/src/main/java/module-info.java
@@ -18,7 +18,7 @@
 module org.junit.platform.suite.engine {
 
 	requires static org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires org.junit.platform.suite.api;
 	requires org.junit.platform.commons;
diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 	api(projects.junitPlatformLauncher)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)
diff --git a/junit-platform-testkit/src/main/java/module-info.java b/junit-platform-testkit/src/main/java/module-info.java
@@ -17,7 +17,7 @@
 module org.junit.platform.testkit {
 
 	requires static transitive org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires transitive org.assertj.core;
 	requires org.junit.platform.commons;
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
 	api(libs.junit4)
 
 	compileOnlyApi(libs.apiguardian)
-	compileOnly(libs.jspecify)
+	compileOnlyApi(libs.jspecify)
 
 	testFixturesApi(platform(libs.groovy2.bom))
 	testFixturesApi(libs.spock1)
diff --git a/junit-vintage-engine/src/main/java/module-info.java b/junit-vintage-engine/src/main/java/module-info.java
@@ -20,7 +20,7 @@
 module org.junit.vintage.engine {
 
 	requires static org.apiguardian.api;
-	requires static org.jspecify;
+	requires static transitive org.jspecify;
 
 	requires junit; // 4
 	requires org.junit.platform.engine;
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
@@ -9,7 +9,7 @@ exports org.junit.jupiter.api.parallel
 requires java.base mandated
 requires kotlin.stdlib static
 requires org.apiguardian.api static transitive
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.platform.commons transitive
 requires org.opentest4j transitive
 qualified opens org.junit.jupiter.api.condition to org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-engine.expected.txt
@@ -1,7 +1,7 @@
 org.junit.jupiter.engine@${version} jar:file:.+/junit-jupiter-engine-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires org.apiguardian.api static
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.jupiter.api
 requires org.junit.platform.commons
 requires org.junit.platform.engine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-migrationsupport.expected.txt
@@ -7,6 +7,6 @@ exports org.junit.jupiter.migrationsupport.rules.member
 requires java.base mandated
 requires junit transitive
 requires org.apiguardian.api static transitive
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.jupiter.api transitive
 requires org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-params.expected.txt
@@ -6,7 +6,7 @@ exports org.junit.jupiter.params.provider
 exports org.junit.jupiter.params.support
 requires java.base mandated
 requires org.apiguardian.api static transitive
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.jupiter.api transitive
 requires org.junit.platform.commons transitive
 qualified opens org.junit.jupiter.params to org.junit.platform.commons
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
@@ -1,7 +1,7 @@
 org.junit.platform.console@${version} jar:file:.+/junit-platform-console-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires org.apiguardian.api static
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine
 requires org.junit.platform.launcher
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-engine.expected.txt
@@ -9,7 +9,7 @@ exports org.junit.platform.engine.support.hierarchical
 exports org.junit.platform.engine.support.store
 requires java.base mandated
 requires org.apiguardian.api static transitive
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.platform.commons transitive
 requires org.opentest4j transitive
 uses org.junit.platform.engine.discovery.DiscoverySelectorIdentifierParser
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-launcher.expected.txt
@@ -7,7 +7,7 @@ requires java.base mandated
 requires java.logging transitive
 requires jdk.jfr static
 requires org.apiguardian.api static transitive
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.platform.commons transitive
 requires org.junit.platform.engine transitive
 uses org.junit.platform.engine.TestEngine
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-reporting.expected.txt
@@ -5,7 +5,7 @@ exports org.junit.platform.reporting.open.xml
 requires java.base mandated
 requires java.xml
 requires org.apiguardian.api static transitive
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine transitive
 requires org.junit.platform.launcher transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-api.expected.txt
@@ -2,5 +2,5 @@ org.junit.platform.suite.api@${version} jar:file:.+/junit-platform-suite-api-\d.
 exports org.junit.platform.suite.api
 requires java.base mandated
 requires org.apiguardian.api static transitive
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.platform.commons transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-suite-engine.expected.txt
@@ -1,7 +1,7 @@
 org.junit.platform.suite.engine@${version} jar:file:.+/junit-platform-suite-engine-\d.+\.jar..module-info\.class
 requires java.base mandated
 requires org.apiguardian.api static
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine
 requires org.junit.platform.launcher
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-testkit.expected.txt
@@ -3,7 +3,7 @@ exports org.junit.platform.testkit.engine
 requires java.base mandated
 requires org.apiguardian.api static transitive
 requires org.assertj.core transitive
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.platform.commons
 requires org.junit.platform.engine transitive
 requires org.junit.platform.launcher transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-vintage-engine.expected.txt
@@ -2,7 +2,7 @@ org.junit.vintage.engine@${version} jar:file:.+/junit-vintage-engine-\d.+\.jar..
 requires java.base mandated
 requires junit
 requires org.apiguardian.api static
-requires org.jspecify static
+requires org.jspecify static transitive
 requires org.junit.platform.engine
 provides org.junit.platform.engine.TestEngine with org.junit.vintage.engine.VintageTestEngine
 contains org.junit.vintage.engine

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ dependencies {`
`55`	`55`	`because("Jupiter API is used in src/main/java")`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ compileOnlyApi(libs.jspecify)`
	`59`	`+`
`58`	`60`	`// Pull in all "modular projects" to ensure that they are included`
`59`	`61`	`// in reports generated by the ApiReportGenerator.`
`60`	`62`	`modularProjects.forEach { apiReport(it) }`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`api(projects.junitJupiterApi)`
`13`	`13`
`14`	`14`	`compileOnlyApi(libs.apiguardian)`
`15`		`- compileOnly(libs.jspecify)`
	`15`	`+ compileOnlyApi(libs.jspecify)`
`16`	`16`
`17`	`17`	`osgiVerification(projects.junitPlatformLauncher)`
`18`	`18`	`}`