follow up of junit-team#2544 to enable a fully resolveable OSGi solution

What this means is that merely by consuming the Jupiter client APIs results in requiring a fully fleshed out runtime including launcher as follows - junit-jupiter-api & junit-jupiter-params Requires a org.junit.platform.engine=junit-jupiter - junit-jupiter-engine Provides org.junit.platform.engine=junit-jupiter - junit-vintage-engine Provides org.junit.platform.engine=junit-vintage - junit-jupiter-engine & junit-vintage-engine Requires org.junit.platform.launcher=junit-platform-launcher - junit-platform-launcher Provides org.junit.platform.launcher=junit-platform-launcher The solution is solvable by consuming junit-jupiter-api & junit-jupiter-params in your tests OR in the case of vintage having @requirement(namespace = "org.junit.platform.engine", name = "junit-vintage") Signed-off-by: Raymond Augé <raymond.auge@liferay.com>
rotty3000 · Oct 28, 2021 · a417fe0 · a417fe0
1 parent d438955
commit a417fe0
Show file tree

Hide file tree

Showing 18 changed files with 95 additions and 2 deletions.
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.9.0-M1.adoc
@@ -23,7 +23,7 @@ on GitHub.
 
 ==== New Features and Improvements
 
-* ❓
+* JUnit OSGi bundles now contain `engine` and `launcher` requirements ensuring that at resolution time a fully running set of dependencies are calculated avoiding the need for these to be manually specified.
 
 
 [[release-notes-5.9.0-M1-junit-jupiter]]

diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -13,4 +13,20 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 
 	compileOnly(kotlin("stdlib"))
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
+}
+
+tasks {
+	jar {
+		bundle {
+			bnd("""
+				Require-Capability:\
+					org.junit.platform.engine;\
+						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${rootProject.property("version")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("version")!!}}})))';\
+						effective:=active
+			""")
+		}
+	}
 }
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -23,6 +23,8 @@ dependencies {
 	testImplementation(libs.junit4)
 	testImplementation(libs.kotlinx.coroutines)
 	testImplementation(libs.groovy4)
+
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks {
@@ -39,6 +41,10 @@ tasks {
 					org.junit.platform.engine;\
 						org.junit.platform.engine='junit-jupiter';\
 						version:Version="${'$'}{version_cleanup;${project.version}}"
+				Require-Capability:\
+					org.junit.platform.launcher;\
+						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}}})))';\
+						effective:=active
 			""")
 		}
 	}

diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -17,6 +17,9 @@ dependencies {
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformSuiteEngine)
 	testImplementation(projects.junitPlatformTestkit)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks.jar {

diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -21,6 +21,22 @@ dependencies {
 
 	compileOnly(kotlin("stdlib"))
 	testImplementation(kotlin("stdlib"))
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
+}
+
+tasks {
+	jar {
+		bundle {
+			bnd("""
+				Require-Capability:\
+					org.junit.platform.engine;\
+						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${rootProject.property("version")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("version")!!}}})))';\
+						effective:=active
+			""")
+		}
+	}
 }
 
 tasks {

diff --git a/junit-jupiter/junit-jupiter.gradle.kts b/junit-jupiter/junit-jupiter.gradle.kts
@@ -10,4 +10,7 @@ dependencies {
 	api(projects.junitJupiterParams)
 
 	runtimeOnly(projects.junitJupiterEngine)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-console/junit-platform-console.gradle.kts b/junit-platform-console/junit-platform-console.gradle.kts
@@ -14,6 +14,9 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 
 	shadowed(libs.picocli)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks {

diff --git a/junit-platform-engine/junit-platform-engine.gradle.kts b/junit-platform-engine/junit-platform-engine.gradle.kts
@@ -13,4 +13,7 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 
 	testImplementation(libs.assertj)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-jfr/junit-platform-jfr.gradle.kts b/junit-platform-jfr/junit-platform-jfr.gradle.kts
@@ -9,6 +9,9 @@ dependencies {
 	api(projects.junitPlatformLauncher)
 
 	compileOnlyApi(libs.apiguardian)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 javaLibrary {

diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -10,4 +10,19 @@ dependencies {
 	api(projects.junitPlatformEngine)
 
 	compileOnlyApi(libs.apiguardian)
+
+	osgiVerification(projects.junitJupiterEngine)
+}
+
+tasks {
+	jar {
+		bundle {
+			bnd("""
+				Provide-Capability:\
+					org.junit.platform.launcher;\
+						org.junit.platform.launcher='junit-platform-launcher';\
+						version:Version="${'$'}{version_cleanup;${project.version}}"
+			""")
+		}
+	}
 }
diff --git a/junit-platform-reporting/junit-platform-reporting.gradle.kts b/junit-platform-reporting/junit-platform-reporting.gradle.kts
@@ -9,4 +9,7 @@ dependencies {
 	api(projects.junitPlatformLauncher)
 
 	compileOnlyApi(libs.apiguardian)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -17,6 +17,9 @@ dependencies {
 
 	testImplementation(testFixtures(projects.junitPlatformEngine))
 	testImplementation(testFixtures(projects.junitPlatformLauncher))
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks.jar {

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,5 +10,6 @@ dependencies {
 
 	compileOnlyApi(libs.apiguardian)
 
-	osgiVerification(projects.junitPlatformCommons)
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts b/junit-platform-suite-commons/junit-platform-suite-commons.gradle.kts
@@ -12,4 +12,7 @@ dependencies {
 
 	implementation(projects.junitPlatformEngine)
 	implementation(projects.junitPlatformSuiteApi)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts b/junit-platform-suite-engine/junit-platform-suite-engine.gradle.kts
@@ -12,4 +12,7 @@ dependencies {
 	compileOnlyApi(libs.apiguardian)
 
 	implementation(projects.junitPlatformSuiteCommons)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-suite/junit-platform-suite.gradle.kts b/junit-platform-suite/junit-platform-suite.gradle.kts
@@ -8,4 +8,7 @@ dependencies {
 	api(platform(projects.junitBom))
 	api(projects.junitPlatformSuiteApi)
 	implementation(projects.junitPlatformSuiteEngine)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-platform-testkit/junit-platform-testkit.gradle.kts b/junit-platform-testkit/junit-platform-testkit.gradle.kts
@@ -11,4 +11,7 @@ dependencies {
 	api(projects.junitPlatformLauncher)
 
 	compileOnlyApi(libs.apiguardian)
+
+	osgiVerification(projects.junitJupiterEngine)
+	osgiVerification(projects.junitPlatformLauncher)
 }
diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -22,6 +22,8 @@ dependencies {
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformSuiteEngine)
 	testImplementation(projects.junitPlatformTestkit)
+
+	osgiVerification(projects.junitPlatformLauncher)
 }
 
 tasks {
@@ -51,6 +53,10 @@ tasks {
 					org.junit.platform.engine;\
 						org.junit.platform.engine='junit-vintage';\
 						version:Version="${'$'}{version_cleanup;${project.version}}"
+				Require-Capability:\
+					org.junit.platform.launcher;\
+						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}}})))';\
+						effective:=active
 			""")
 		}
 	}